diff options
| author | Jenkins for ownCloud <owncloud-bot@tmit.eu> | 2015-04-17 13:49:42 +0300 |
|---|---|---|
| committer | Jenkins for ownCloud <owncloud-bot@tmit.eu> | 2015-04-17 13:49:42 +0300 |
| commit | bc1bc2a4f862a899a04af94a085c4689a8201957 (patch) | |
| tree | 49e9b7cd179611065f8c82e2abee419829fea675 /translations | |
| parent | 155c96586648588ef73edc91c4198d6e3738a2f9 (diff) | |
[tx-robot] updated from transifex
Diffstat (limited to 'translations')
30 files changed, 14244 insertions, 11742 deletions
diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 485193a88..d3a9867f5 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -30,27 +30,27 @@ <translation>Formulari</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Seleccioneu una carpeta de destinació remota</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Refresca</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Carpetes:</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -134,97 +134,97 @@ <translation>Continua</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Confirma l'eliminació de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Voleu aturar la sincronització de la carpeta <i>%1</i>?</p><p><b>Nota:</b> Això no eliminarà els fitxers del client.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Confirmeu la reinicialització de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Voleu reiniciar la carpeta <i>%1</i> i reconstruir la base de dades del client?</p><p><b>Nota:</b> Aquesta funció existeix només per tasques de manteniment. Cap fitxer no s'eliminarà, però podria provocar-se un transit de dades significant i podria trigar diversos minuts o hores en completar-se, depenent de la mida de la carpeta. Utilitzeu aquesta opció només si us ho recomana l'administrador.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>S'està sincronitzant</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>S'està sincronitzant.<br/>Voleu parar-la?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 de %4) %5 pendents a un ràtio de %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 de %2, fitxer %3 de %4 Temps restant total %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>fitxer %1 de %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) de %2 l'espai del servidor en ús.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Actualment no hi ha informació disponible de l'ús d'emmagatzemament.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Connectat a <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Connectat a <a href="%1">%2</a> com a <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>No hi ha connexió amb %1 a <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>La connexió %1 no està configurada.</translation> </message> @@ -257,12 +257,12 @@ Temps restant total %5</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation type="unfinished"/> </message> @@ -293,33 +293,38 @@ Temps restant total %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>No hi ha cap compte ownCloud configurat</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>El servidor configurat per aquest client és massa antic</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Actualitzeu el servidor a l'última versió i reestabliu el client.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>No es pot connectar amb %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>temps excedit</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Les credencials proporcionades no són correctes</translation> </message> @@ -327,30 +332,38 @@ Temps restant total %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>No s'ha pogut crear el context-csync</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>El fitxer local %1 no existeix.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 hauria de ser una carpeta, però no ho és.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>No es pot llegir %1.</translation> </message> @@ -464,62 +477,62 @@ Esteu segur que voleu executar aquesta operació?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>No es pot restablir l'estat de la carpeta</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>S'ha trobat un diari de sincronització antic '%1', però no s'ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Estat indefinit.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Espera per començar la sincronització.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Perparant per la sincronització.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>S'està sincronitzant.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>La darrera sincronització va ser correcta.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>La última sincronització ha estat un èxit, però amb avisos en fitxers individuals.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Error de configuració.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Cancel·la usuari.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>La sincronització està en pausa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sync està pausat)</translation> </message> @@ -546,8 +559,8 @@ Esteu segur que voleu executar aquesta operació?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Afegeix una carpeta</translation> </message> @@ -555,67 +568,67 @@ Esteu segur que voleu executar aquesta operació?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Feu clic per seleccionar un directori local per sincronitzar.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Introduïu la ruta del directori local.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>L'àlies del directori és un nom descriptiu per la connexió de ssincronització.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>No s'ha seleccionat cap directori local vàlid!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>No teniu permisos per escriure en la carpeta seleccionada!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>La ruta local %1 ja és n directori de pujada. Si us play, seleccioneu un altre!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>L'entrada actual conté una carpeta ja configurada.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>El fitxer seleccionat és un enllaç simbòlic. Aquest enllaç apunta a una carpeta ja configurada.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Un directori ja configurat conté el directori qe heu introduït.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>El directori seleccionat és un enllaç simbòlic. Ja heu configurat una carpeta que apunta als pares de la carpeta que apunta aquest enllaç.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>L'àlies no pot ser buit. Faciliteu una paraula descriptiva.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>L'alies <i>%1%<i> ja està en ús. Si us plau, esculli un altre àlies.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Seleccioneu la carpeta font</translation> </message> @@ -623,42 +636,47 @@ Esteu segur que voleu executar aquesta operació?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>La carpeta s'ha creat correctament a %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>No s'ha pogut crear el directori en %1. Si us plau, comproveu-lo manualment.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Escolliu-ho per sincronitzar el compte sencer</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Ja s'està sincronitzant aquest directori.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Ja esteu sincronitzant <i>%1</i>, que és una carpeta dins de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Ja esteu sincronitzant tots els vostres fitxers. Sincronitzar una altra carpeta <b>no</b> està permes. Si voleu sincronitzar múltiples carpetes, elimineu la configuració de sincronització de la carpeta arrel.</translation> </message> @@ -666,7 +684,7 @@ Esteu segur que voleu executar aquesta operació?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> @@ -674,31 +692,35 @@ Esteu segur que voleu executar aquesta operació?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Avís:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>No s'ha rebut cap E-Tag del servidor, comproveu el Proxy/Gateway</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Hem rebut un E-Tag diferent en la represa. Es comprovarà la pròxima vegada.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Temps de connexió excedit</translation> </message> @@ -755,12 +777,12 @@ Esteu segur que voleu executar aquesta operació?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Escriviu contrasenya</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Escriviu %1 contrasenya per s'usuari '%2':</translation> </message> @@ -836,8 +858,8 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Cerca:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>No s'ha pogut escriure el fitxer de registre</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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>El fitxer '%1'<br/>no es pot obrir en mode escriptura.<br/><br/>La sortida del registre <b>no</b> es pot desar!</nobr></translation> </message> @@ -896,7 +918,7 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> @@ -904,27 +926,27 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Versió nova disponible</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Hi ha una nova versió del client %1 disponible.</p><p><b>%2</b> està disponible per a la baixada. La versió instal·lada és la %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Omet aquesta versió</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Omet aquesta vegada</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Obtingueu l'actualització</translation> </message> @@ -1033,54 +1055,53 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Nova actualització a punt</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Una nova actualització és apunt d'instal·lar-se. L'actualització pot demanar privilegis addicionals durant el procés. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Descarregat la versió %1. Espeu si us play...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Versió %1 disponible. Reinicieu l'aplicació per començar l'actualització.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>No s'ha pogut decarregar l'actualització. Si us plau, cliqueu <a href='%1'>aqui</a>per descarregar l'actualització manualment.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>No s'ha pogut comprovar si hi ha actualitzacions.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Nova versió %1 disponible. Utilitzeu l'eina d'actualització del sistema per instal·lar-la.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Comprovació d'actualitzacions al servidor</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>No hi ha actualitzacions disponibles. La instal·lació ja es troba en la versió més recent.</translation> </message> @@ -1108,28 +1129,33 @@ for additional privileges during the process.</source> <translation>%1 carpeta '%2' està sincronitzat amb la carpeta local '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Avís:</strong> Teniu múltiples carpetes configurades. Si continueu amb la configuració actual, la configuració de carpetes es descartarà i només es crearà una única carpeta arrel de sincronització!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Avís:</strong> La carpeta local no està buida. Escolliu una resolució!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Fitxer local de sincronització</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Configuració avançada d'actualització</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation type="unfinished"/> </message> @@ -1147,7 +1173,7 @@ for additional privileges during the process.</source> <translation>Escriviu les credencials d'usuari</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Actualitza les credencials d'usuari</translation> </message> @@ -1190,129 +1216,139 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">S'ha connectat correctament amb %1: %2 versió %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Ha fallat la connexió amb %1 a %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Intentant connectar amb %1 a %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>La carpeta local %1 ja existeix, s'està configurant per sincronitzar.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> - <source>Creating local sync folder %1... </source> - <translation>Creant carpeta local de sincronització %1...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>correcte</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>ha fallat.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>No s'ha pogut crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>No heu especificat cap carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>creant la carpeta a ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>La carpeta remota %1 s'ha creat correctament.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ja existeix. S'hi està connectant per sincronitzar-les.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creació de la carpeta ha resultat en el codi d'error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Ha fallat la creació de la carpeta perquè les credencials proporcionades són incorrectes!<br/>Aneu enrera i comproveu les credencials.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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ó de la carpeta remota ha fallat, probablement perquè les credencials facilitades són incorrectes.</font><br/>Comproveu les vostres credencials.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La creació de la carpeta remota %1 ha fallat amb l'error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>S'ha establert una connexió de sincronització des de %1 a la carpeta remota %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Connectat amb èxit a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No s'ha pogut establir la connexió amb %1. Comproveu-ho de nou.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Ha fallat en canviar el nom de la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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 es pot esborrar i restaurar la carpeta perquè una carpeta o un fitxer de dins està obert en un altre programa. Tanqueu la carpeta o el fitxer i intenteu-ho de nou o cancel·leu la configuració.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>la carpeta de sincronització %1 s'ha creat correctament!</b></font></translation> </message> @@ -1351,7 +1387,7 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Temps de connexió excedit</translation> </message> @@ -1359,7 +1395,7 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"/> </message> @@ -1395,17 +1431,17 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>El fitxer %1 no es pot baixar perquè hi ha un xoc amb el nom d'un fitxer local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -1413,17 +1449,17 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; La restauració ha fallat: </translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>S'ha eliminat un fitxer o carpeta de la compartició nómés de lectura, però la restauració ha fallat: %1</translation> </message> @@ -1431,12 +1467,12 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Atenció, possible xoc entre majúscules i minúscules amb %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>No s'ha pogut crear el directori %1</translation> </message> @@ -1444,17 +1480,17 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>No es pot eliminar %1 perquè hi ha un xoc amb el nom d'un fitxer local</translation> </message> @@ -1462,7 +1498,7 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>El fitxer %1 no es pot reanomenar a %2 perquè hi ha un xoc amb el nom d'un fitxer local</translation> </message> @@ -1470,44 +1506,44 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>El fitxer s'ha eliminat d'una compartició només de lectura. S'ha restaurat.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>No s'ha de canviar el nom d'aquesta carpeta. Es reanomena de nou amb el seu nom original.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Aquesta carpeta no es pot reanomenar. Reanomeneu-la de nou Shared.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>El fitxer s'ha reanomenat però és part d'una compartició només de lectura. El fixter original s'ha restaurat.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> @@ -1533,33 +1569,33 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>El fitxer local ha canviat durant la sincronització.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>El fitxer s'ha editat localment però és part d'una compartició només de lectura. S'ha restaurat i la vostra edició és en el fitxer en conflicte.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>El fitxer local s'ha eliminat durant la sincronització.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>El servidor no ha reconegut l'últim fragment. (No hi havia e-Tag)</translation> </message> @@ -1577,16 +1613,6 @@ No és aconsellada usar-la.</translation> <translation>Activitat de sincronització</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Hora</translation> @@ -1627,34 +1653,34 @@ No és aconsellada usar-la.</translation> <translation>Copia la llista d'activitats al porta-retalls.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>S'ha copiat al porta-retalls</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>L'estat de sincronització s'ha copiat al porta-retalls.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation type="unfinished"/> </message> @@ -1662,22 +1688,22 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation type="unfinished"/> </message> @@ -1685,20 +1711,31 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Carregant...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Nom</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Mida</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1708,22 +1745,22 @@ No és aconsellada usar-la.</translation> <translation>Arranjament</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Compte</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Activitat</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>General</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Xarxa</translation> </message> @@ -1731,27 +1768,27 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Compte</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Activitat</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>General</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Xarxa</translation> </message> @@ -1764,104 +1801,139 @@ No és aconsellada usar-la.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Enllaç de compartició</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Escolliu una contrasenya per l'enllaç públic</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> - <source>Waiting to upload...</source> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> - <source>Unable to register in sync space.</source> + <location filename="../src/gui/sharedialog.cpp" line="608"/> + <source>Waiting to upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> + <location filename="../src/gui/sharedialog.cpp" line="610"/> + <source>Unable to register in sync space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"/> </message> @@ -1882,30 +1954,25 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Autenticat</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Es requereix nova acreditació</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>La vostra sessió ha vençut. Heu d'acreditar-vos de nou per continuar usant el client.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"/> @@ -1914,114 +1981,114 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Detalls del certificat</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Nom comú (NC):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Noms alternatius de concepte:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organització (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Unitat organitzativa (UO):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Estat o província</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>País:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Serial:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Emissor</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Emissor:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Enviat el:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Expira el:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Empremtes</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Nota:</b> Aquest certificat es va aprovar manualment</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (auto-signat)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Aquesta connexió és encriptada usant %1 bit %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Informació del certificat:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Aquesta connexió NO és segura , ja que no està xifrada. @@ -2042,67 +2109,67 @@ No és aconsellada usar-la.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>Connexió SSL</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Avisos quant a la connexió SSL actual:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>amb certificat %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;no especificat&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organització %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Unitat: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Empremta digital (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Empremta digital (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Data d'efecte: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Emissor: %1</translation> </message> @@ -2110,219 +2177,229 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Èxit.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync ha fallat en carregar o crear el fitxer de revista. Assegureu-vos que yeniu permisos de lectura i escriptura en la carpeta local de sincronització.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>No s'ha pogut carregar el connector %1 per csync.<br/>Comproveu la instal·lació!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync ha patit un error mentre processava els àrbres interns.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync ha fallat en reservar memòria.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>Error fatal de paràmetre en CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>El pas d'actualització del processat de CSync ha fallat.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>El pas de reconciliació del processat de CSync ha fallat.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync no s'ha pogut acreditar amb el proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync ha fallat en cercar el proxy o el servidor.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>L'autenticació de CSync ha fallat al servidor %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync ha fallat en connectar-se a la xarxa.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Temps excedit en la connexió.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>S'ha produït un error en la transmissió HTTP.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync ha fallat en no implementar el permís denegat.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync ha fallat en accedir</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync ha intentat crear una carpeta que ja existeix.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: No hi ha espai disponible al servidor %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>Error inespecífic de CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Aturat per l'usuari</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>S'ha produït l'error intern número %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>L'element no s'ha sincronitzat degut a errors previs: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>La sincronització d'enllaços simbòlics no està implementada.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>El fitxer està a la llista d'ignorats.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>El fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>No es pot inicialitzar un periòdic de sincronització</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>No es pot obrir el diari de sincronització</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>No es permet perquè no teniu permisos per afegir subcarpetes en aquesta carpeta</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>No es permet perquè no teniu permisos per afegir una carpeta inferior</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>No es permet perquè no teniu permisos per afegir fitxers en aquesta carpeta</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>No es permet l'eliminació, es restaura</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Fitxers locals i carpeta compartida esborrats.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>No es permet moure'l, l'element es restaura</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>No es permet moure perquè %1 només és de lectura</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>el destí</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>l'origen</translation> </message> @@ -2330,7 +2407,7 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2338,17 +2415,17 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 type="unfinished"/> </message> @@ -2453,6 +2530,7 @@ No és aconsellada usar-la.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"/> </message> <message> @@ -2499,7 +2577,7 @@ No és aconsellada usar-la.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"/> </message> @@ -2596,7 +2674,7 @@ No és aconsellada usar-la.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"/> </message> @@ -2773,12 +2851,12 @@ No és aconsellada usar-la.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>La safata del sistema no està disponible</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 requereix una safata del sistema que funcioni. Si esteu executant XFCE seguiu <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">aquestes instruccions</a>. Altrament, instal·leu una aplicació de safata com 'trayer' i intenteu-ho de nou.</translation> </message> @@ -2786,82 +2864,87 @@ No és aconsellada usar-la.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Construit de la revisió Git <a href="%1">%2</a> a %3, %4 usant Qt %5.</small><p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Descarregat</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Carregat</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Eliminat</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>S'ha mogut a %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Ignorat</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Error d'accés al sistema de fitxers</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Desconegut</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>baixant</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>pujant</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>esborrant</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>movent</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>ignorant</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>error</translation> </message> @@ -2869,52 +2952,52 @@ No és aconsellada usar-la.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Estat indefinit</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Pendent d'iniciar la sincronització</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>La sincronització s'està executant</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Sincronització amb èxit</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation>Sincronització realitzada amb èxit, alguns fitxers s'han ignorat.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Error de sincronització</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Error de configuració</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Preparant per sincronitzar</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Cancel·lant...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>La incronització està pausada.</translation> </message> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index c97abe69a..e053a0859 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -30,27 +30,27 @@ <translation>Formulář</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Zvolte vzdálenou cílovou složku</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Vytvořit adresář</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Obnovit</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Složky</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -134,97 +134,97 @@ <translation>Obnovit</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Potvrdit odstranění složky</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Opravdu chcete zastavit synchronizaci složky <i>%1</i>?</p><p><b>Poznámka:</b> Tato akce nesmaže soubory z místní složky.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Potvrdit restartování složky</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Skutečně chcete resetovat složku <i>%1</i> a znovu sestavit klientskou databázi?</p><p><b>Poznámka:</b> Tato funkce je určena pouze pro účely údržby. Žádné soubory nebudou smazány, ale může to způsobit velké datové přenosy a dokončení může trvat mnoho minut či hodin v závislosti na množství dat ve složce. Použijte tuto volbu pouze na pokyn správce.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Synchronizace probíhá</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <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="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Prohledávám '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 z %4) zbývající čas %5 při rychlosti %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 z %2, soubor %3 ze %4 Celkový zbývající čas %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>soubor %1 z %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) z %2 místa na disku použito.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <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="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Připojeno k <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Připojeno k <a href="%1">%2</a> jako <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Žádné spojení s %1 na <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Žádné spojení s %1 nenastaveno.</translation> </message> @@ -257,12 +257,12 @@ Celkový zbývající čas %5</translation> <translation>Heslo certifikátu :</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Vybrat certifikát</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Soubory certifikátu (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Celkový zbývající čas %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Žádný účet ownCloud nenastaven</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Server nastavený pro tohoto klienta je příliš starý</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Prosím, aktualizujte na poslední verzi serveru a restartujte klienta.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Nelze se připojit k %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>vypršel časový interval</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Poskytnuté přihlašovací údaje nejsou správné</translation> </message> @@ -327,30 +332,38 @@ Celkový zbývající čas %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Připojení vypršelo</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Nepodařilo se vytvořit csync-context</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Místní složka %1 neexistuje.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 by měl být adresář, ale není.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 není čitelný.</translation> </message> @@ -464,62 +477,62 @@ Opravdu chcete provést tuto akci?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Nelze obnovit stav složky</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Nedefinovaný stav.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Vyčkává na spuštění synchronizace.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Příprava na synchronizaci.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Synchronizace probíhá.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Poslední synchronizace byla úspěšná.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Poslední synchronizace byla úspěšná, ale s varováním u některých souborů</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Chyba nastavení.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Zrušení uživatelem.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Synchronizace pozastavena.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronizace je pozastavena)</translation> </message> @@ -546,8 +559,8 @@ Opravdu chcete provést tuto akci?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Přidat složku</translation> </message> @@ -555,67 +568,67 @@ Opravdu chcete provést tuto akci?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Kliknutím zvolíte místní složku k synchronizaci.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Zadejte cestu k místní složce.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>Alias složky je popisné jméno pro tuto synchronizaci.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Nebyla vybrána místní složka!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Nemáte oprávnění pro zápis do zvolené složky!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Místní cesta %1 je již nastavena jako složka pro odesílání. Zvolte, prosím, jinou!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>V aktuální položce se již nachází složka s nastavenou synchronizací.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Vybraná složka je symbolický odkaz. Cílová složka tohoto odkazu již obsahuje nastavenou složku.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Právě zadaná složka je již obsažena ve složce s nastavenou synchronizací.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Zvolená složka je symbolický odkaz. Cílová složka tohoto odkazu již obsahuje složku s nastavenou synchronizací.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Alias nemůže být prázdný. Zadejte prosím slovo, kterým složku popíšete.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>Alias <i>%1</i> je již používán. Zvolte prosím jiný.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Zvolte zdrojovou složku</translation> </message> @@ -623,42 +636,47 @@ Opravdu chcete provést tuto akci?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Vytvořit vzdálenou složku</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Zadejte název nově vytvářené složky níže '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Složka byla úspěšně vytvořena na %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Na %1 selhalo vytvoření složky. Zkontrolujte to, prosím, ručně.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <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="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Tato složka je již synchronizována.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Již synchronizujete složku <i>%1</i>, která je složce <i>%2</i> nadřazená.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Již synchronizujete všechny své soubory. Synchronizování další složky <b>není</b> podporováno. Pokud chcete synchronizovat více složek, odstraňte prosím synchronizaci aktuální kořenové složky.</translation> </message> @@ -666,7 +684,7 @@ Opravdu chcete provést tuto akci?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Výběr synchronizace: Můžete dodatečně označit podsložky, které si nepřejete synchronizovat.</translation> </message> @@ -674,31 +692,35 @@ Opravdu chcete provést tuto akci?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Varování:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Server odpověděl chybným rozsahem obsahu</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Čas spojení vypršel</translation> </message> @@ -755,12 +777,12 @@ Opravdu chcete provést tuto akci?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Zadejte heslo</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Zadejte prosím %1 heslo pro uživatele '%2': </translation> </message> @@ -836,8 +858,8 @@ Zvolené položky budou smazány také v případě, že brání smazání adres </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Hledat: </translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Zvolené položky budou smazány také v případě, že brání smazání adres </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Nemohu zapisovat do log souboru</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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> @@ -896,7 +918,7 @@ Zvolené položky budou smazány také v případě, že brání smazání adres <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Připojení vypršelo</translation> </message> @@ -904,27 +926,27 @@ Zvolené položky budou smazány také v případě, že brání smazání adres <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Je dostupná nová verze</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Je k dispozici nová verze klienta %1.</p><p><b>%2</b> je k dispozici ke stažení. Momentálně je nainstalována verze %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Přeskoč tuto verzi</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Tentokrát přeskočit</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Získat aktualizaci</translation> </message> @@ -1033,54 +1055,53 @@ Zvolené položky budou smazány také v případě, že brání smazání adres <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Nová aktualizace připravena</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Nová aktualizace bude nainstalována. Aktualizační proces -si může v průběhu vyžádat dodatečná práva.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Stahuji verzi %1. Počkejte prosím ...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Verze %1 je dostupná. Aktualizaci zahájíte restartováním aplikace.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Nemohu stáhnout aktualizaci. Klikněte, prosím, na <a href='%1'>tento odkaz</a> pro ruční stažení aktualizace.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Nemohu zkontrolovat aktualizace.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Je dostupná nová verze %1. Pro instalaci použijte aktualizační nástroj systému. </translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Kontroluji aktualizační server...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Stav aktualizace neznámý: Nové aktualizace nebyly zkontrolovány.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Žádne aktualizace nejsou k dispozici. Používáte aktuální verzi.</translation> </message> @@ -1108,28 +1129,33 @@ si může v průběhu vyžádat dodatečná práva.</translation> <translation>%1 složka '%2' je synchronizována do místní složky '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Varování:</strong> Aktuálně máte nastavenu synchronizaci více složek. Pokud budete pokračovat s tímto nastavení, nastavení složek bude zapomenuto a bude vytvořena synchronizace jedné kořenové složky!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory 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="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Místní synchronizovaná složka</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Změnit pokročilé nastavení</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1147,7 +1173,7 @@ si může v průběhu vyžádat dodatečná práva.</translation> <translation>Zadejte přihlašovací údaje</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Upravte přihlašovací údaje</translation> </message> @@ -1190,129 +1216,139 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <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="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <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="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <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="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <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="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Místní synchronizovaná složka %1 již existuje, nastavuji ji pro synchronizaci.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> - <source>Creating local sync folder %1... </source> - <translation>Vytvářím místní synchronizovanou složku %1... </translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>OK</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>selhalo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>Nelze vytvořit místní složku %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Žádná vzdálená složka nenastavena!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>vytvářím složku na ownCloudu: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Vzdálená složka %1 byla úspěšně vytvořena.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Vzdálená složka %1 již existuje. Spojuji ji pro synchronizaci.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Vytvoření složky selhalo HTTP chybou %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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é složky 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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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é složky 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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Vytváření vzdálené složky %1 selhalo s chybou <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Úspěšně spojeno s %1.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <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="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Přejmenování složky selhalo</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Místní synchronizovaná složka %1 byla vytvořena úspěšně!</b></font></translation> </message> @@ -1351,7 +1387,7 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Čas spojení vypršel</translation> </message> @@ -1359,7 +1395,7 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>Neplatná JSON odpověď z adresy URL</translation> </message> @@ -1395,17 +1431,17 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Soubor nemohl být kompletně stažen.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému!</translation> </message> @@ -1413,17 +1449,17 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Obnovení selhalo:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Pokračovat v blacklistingu:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Soubor nebo adresář by odebrán ze sdílení pouze pro čtení, ale jeho obnovení selhalo: %1</translation> </message> @@ -1431,12 +1467,12 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <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="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>nepodařilo se vytvořit adresář %1</translation> </message> @@ -1444,17 +1480,17 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Chyba při odstraňování '%1': %2;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Nepodařilo se odstranit adresář '%1';</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <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> @@ -1462,7 +1498,7 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <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> @@ -1470,45 +1506,45 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Soubor byl odebrán ze sdílení pouze pro čtení. Soubor byl obnoven.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Obdržen chybný HTTP kód ze serveru. Očekáváno 204, obdrženo "%1 %2".</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Obdržen chybný HTTP kód ze serveru. Očekáváno 201, obdrženo "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Tato složka nemůže být přejmenována. Byl jí vrácen původní název.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Tato složka nemůže být přejmenována. Přejmenujte jí prosím zpět na Shared.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Soubor byl přejmenován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Obdržen chybný HTTP kód ze serveru. Očekáváno 201, obdrženo "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1533,33 +1569,33 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Soubor odebrán</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Místní soubor byl změněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>Chybí adresa URL</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <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/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation> </message> @@ -1577,16 +1613,6 @@ Nedoporučuje se jí používat.</translation> <translation>Průběh synchronizace</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Čas</translation> @@ -1627,22 +1653,22 @@ Nedoporučuje se jí používat.</translation> <translation>Kopírovat záznam aktivity do schránky.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Zkopírováno do schránky</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Stav synchronizace byl zkopírován do schránky.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>V současné době nejsou na černé listině žádné soubory kvůli předchozím chybovým stavům a neprobíhá žádné stahování.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>%n soubor je ignorován kvůli předchozím chybám. @@ -1651,7 +1677,7 @@ Nedoporučuje se jí používat.</translation> </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n soubor je částečně stažen. @@ -1660,7 +1686,7 @@ Nedoporučuje se jí používat.</translation> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Zkuste je znovu synchronizovat.</translation> </message> @@ -1668,22 +1694,22 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Neoznačené složky budou <b>odstraněny</b> z místního souborového systému a nebudou již synchronizovány na tento počítač</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Výběr synchronizace: Označte vzdálené podsložky, které si přejete synchronizovat.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Výběr synchronizace: Odznačte vzdálené podsložky, které si nepřejete synchronizovat.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Vybrat co synchronizovat</translation> </message> @@ -1691,20 +1717,31 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Načítám ...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Název</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Velikost</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1714,22 +1751,22 @@ Nedoporučuje se jí používat.</translation> <translation>Nastavení</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Účet</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Aktivita</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Hlavní</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Síť</translation> </message> @@ -1737,27 +1774,27 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Účet</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Aktivita</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Hlavní</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Síť</translation> </message> @@ -1770,104 +1807,139 @@ Nedoporučuje se jí používat.</translation> <translation>Sdílet NewDocument.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Sdílet informace</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>Textový popisek</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>sdílet popisek</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>ownCloud cesta:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Sdílet odkaz</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Nastavit heslo</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Nastavit datum vypršení</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Nastavit heslo</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1 v umístění: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>%1 sdílení</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Chráněno heslem</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Zadej heslo pro tento veřejný odkaz</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>OCS API chybový kód: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Není nakonfigurována žádná synchronizační složka.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Nelze nalézt složka pro nahrávání.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>Sdílení externích adresářů ještě nefunguje.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Soubor stejného jména již existuje. Nelze ho proto registrovat pro synchronizování.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>Sdílení externích adresářů ještě nefunguje.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Čekání na nahrávání...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Nelze registrovat v synchronizačním umístění.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Soubor nelze synchronizovat.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>Synchronizace registrovaného souboru ještě nebyla úspěšná.</translation> </message> @@ -1888,30 +1960,25 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - ověření</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Vyžadováno opětovné ověření</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Vaše sezení vypršelo. Chcete-li pokračovat v práci, musíte se znovu přihlásit.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Sdílet s %1</translation> @@ -1920,114 +1987,114 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Detaily certifikátu</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Běžný název (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Alternativní jména subjektu:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organizace (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Organizační jednotka (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Stát/provincie:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Země:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Sériové číslo:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Vydavatel</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Vydavatel:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Vydáno:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Platný do:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Otisky</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Poznámka:</b> Tento certifikát byl schválen ručně</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (podepsaný sám sebou)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Toto spojení je šifrováno pomocí %1 bitové šifry %2 </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Informace o certifikátu:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Toto spojení NENÍ bezpečné, protože není šifrované. @@ -2048,67 +2115,67 @@ Nedoporučuje se jí používat.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL spojení</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Varování o aktuálním SSL spojení:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>s certifikátem %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;nespecifikováno&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organizace: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Jednotka: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Země: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Otisk (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Otisk (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Datum účinnosti: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Datum vypršení: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Vydavatel: %1</translation> </message> @@ -2116,219 +2183,229 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Úspěch.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync se nepodařilo načíst či vytvořit soubor žurnálu. Ujistěte se, že máte oprávnění pro čtení a zápis v místní synchronizované složce.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>Nezdařilo se načtení žurnálovacího souboru CSync. Žurnálovací soubor je poškozený.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Plugin %1 pro csync nelze načíst.<br/>Zkontrolujte prosím instalaci!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync obdrželo chybu při zpracování vnitřních struktur.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync se nezdařilo rezervovat paměť.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>CSync: kritická chyba parametrů.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSync se nezdařilo zpracovat krok aktualizace.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync se nezdařilo zpracovat krok sladění.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync se nemohlo přihlásit k proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync se nezdařilo najít proxy server nebo cílový server.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync se nezdařilo přihlásit k serveru %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync se nezdařilo připojit k síti.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Došlo k vypršení časového limitu síťového spojení.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Nastala chyba HTTP přenosu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync selhalo z důvodu nezpracovaného odmítnutí práv.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync se nezdařil přístup</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync se pokusilo vytvořit adresář, který již existuje.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Nedostatek volného místa na serveru %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>Nespecifikovaná chyba CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Zrušeno uživatelem</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>Připojený adresář je na serveru dočasně nedostupný</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Došlo k chybě při otevírání adresáře</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Nastala vnitřní chyba číslo %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Položka nebyla synchronizována kvůli předchozí chybě: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symbolické odkazy nejsou při synchronizaci podporovány.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Pevné odkazy nejsou při synchronizaci podporovány.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Soubor se nachází na seznamu ignorovaných.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Soubor obsahuje alespoň jeden neplatný znak, který narušuje synchronizaci v prostředí více platforem.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Kódování znaků jména soubor je neplatné</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Nemohu inicializovat synchronizační žurnál.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <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="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorováno podle nastavení "vybrat co synchronizovat"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Není povoleno, protože nemáte oprávnění vytvářet podadresáře v tomto adresáři</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Není povoleno, protože nemáte oprávnění vytvořit rodičovský adresář</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <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/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <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/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Odstranění není povoleno, obnovuji</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Místní soubory a sdílená složka byly odstraněny.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Přesun není povolen, položka obnovena</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Přesun není povolen, protože %1 je pouze pro čtení</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>cílové umístění</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>zdroj</translation> </message> @@ -2336,7 +2413,7 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2344,17 +2421,17 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Verze %1. Více informací na <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Copyright ownCloud, Incorporated</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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> @@ -2459,7 +2536,8 @@ Nedoporučuje se jí používat.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Selhání</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2505,7 +2583,7 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Verze %2. Pro další informace navštivte <a href="%3">%4</a></p><p><small>Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz a další.</small></p><p>Copyright ownCloud, Inc.</p><p>Licencováno pod GNU General Public License (GPL) Version 2.0<br/>ownCloud a ownCloud logo jsou registrované obchodní známky ownCloud, Inc. ve Spojených státech, ostatních zemích nebo obojí</p></translation> </message> @@ -2602,7 +2680,7 @@ Nedoporučuje se jí používat.</translation> <translation>Nakonfigurovat klientský TLS certifikát</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>Nezdařilo se připojení k zabezpečenému serveru <em>%1</em>. Jak si přejete dále postupovat?</p></body></html></translation> </message> @@ -2779,12 +2857,12 @@ Nedoporučuje se jí používat.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Systémová lišta není k dispozici</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 vyžaduje fungující systémovou lištu. Pokud používáte XFCE, řiďte se <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">těmito instrukcemi</a>. V ostatních případech prosím nainstalujte do svého systému aplikaci pro systémovou lištu, např. 'trayer', a zkuste to znovu.</translation> </message> @@ -2792,82 +2870,87 @@ Nedoporučuje se jí používat.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Sestaveno z Git revize <a href="%1">%2</a> na %3, %4 pomocí Qt %5.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Staženo</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Odesláno</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Smazáno</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Přesunuto do %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Ignorováno</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Chyba přístupu k souborovému systému</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Neznámý</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>stahování</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>odesílání</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>mazání</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>přesouvání</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>ignoruji</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>chyba</translation> </message> @@ -2875,52 +2958,52 @@ Nedoporučuje se jí používat.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Nedefinovaný stav</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Čekám na zahájení synchronizace</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Synchronizace běží</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Synchronizace úspěšná</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <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="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Chyba synchronizace</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Chyba nastavení</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Připravuji na synchronizaci</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Ruším...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Synchronizace pozastavena</translation> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index 0903d6786..6b7aa2e96 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -30,27 +30,27 @@ <translation>Formular</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Entfernten Zielordner auswählen</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Ordner erstellen</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Aktualisieren</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Ordner</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -134,98 +134,98 @@ <translation>Fortsetzen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Löschen des Ordners bestätigen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Wollen Sie wirklich die Synchronisation des Ordners <i>%1</i> beenden?</p><p><b>Anmerkung:</b> Dies wird keine Dateien von ihrem Rechner löschen.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Zurücksetzen des Ordners bestätigen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Wollen Sie wirklich den Ordner <i>%1</i> zurücksetzen und die Datenbank auf dem Client neu aufbauen?</p><p><b>Anmerkung:</b> Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entfernt, jedoch kann diese Aktion erheblichen Datenverkehr verursachen und je nach Umfang des Ordners mehrere Minuten oder Stunden in Anspruch nehmen. Verwenden Sie diese Funktion nur dann, wenn ihr Administrator dies ausdrücklich wünscht.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Synchronisation läuft</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Die Synchronistation läuft gerade.<br/>Wollen Sie diese beenden?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>„%1“ wird entdeckt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 von %4) %5 übrig bei einer Rate von %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 von %2, Datei %3 von %4 Gesamtzeit übrig %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>Datei %1 von %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) von %2 Serverkapazität in Benutzung.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <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="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Verbunden mit <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Verbunden mit <a href="%1">%2</a> als <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Keine Verbindung mit %1 zu <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Keine %1-Verbindung konfiguriert.</translation> </message> @@ -258,12 +258,12 @@ Gesamtzeit übrig %5</translation> <translation>Zertifikatskennwort:</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Zertifikat auswählen</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Zertifikatsdateien (*.p12 *.pfx)</translation> </message> @@ -294,33 +294,38 @@ Gesamtzeit übrig %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Kein ownCloud-Konto konfiguriert</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Der konfigurierte Server ist für diesen Client zu alt</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Aktualisieren Sie auf die letzte Server-Version und starten Sie den Client neu.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Verbinden mit %1 nicht möglich</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>Zeitüberschreitung</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Die zur Verfügung gestellten Anmeldeinformationen sind nicht korrekt</translation> </message> @@ -328,30 +333,38 @@ Gesamtzeit übrig %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Zeitüberschreitung bei der Verbindung</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Kann keinen CSync-Kontext erstellen</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Lokales Verzeichnis %1 existiert nicht.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 sollte ein Verzeichnis sein, ist es aber nicht.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 ist nicht lesbar.</translation> </message> @@ -465,62 +478,62 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Konnte Ordner-Zustand nicht zurücksetzen</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Undefinierter Zustand.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Wartet auf Beginn der Synchronistation</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Synchronisation wird vorbereitet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Synchronisation läuft.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Die letzte Synchronisation war erfolgreich.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Installationsfehler.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Benutzer-Abbruch</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Synchronisation wurde angehalten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation ist pausiert)</translation> </message> @@ -547,8 +560,8 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Ordner hinzufügen</translation> </message> @@ -556,67 +569,67 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <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="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <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="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>Der Verzeichnis-Alias ist der beschreibende Name der Synchronisationsverbindung.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Keinen gültigen lokalen Ordner gewählt!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <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/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Das lokale Verzeichnis %1 ist bereits ein Verzeichnis zum Hochladen. Bitte wählen Sie ein anderes Verzeichnis!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Ein bereits konfigurierter Ordner ist im aktuellen Verzeichnis vorhanden.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Das gewählte Verzeichnis ist ein symbolischer Link. Ein bereits konfigurierter Ordner befindet sich in dem Ordner auf den dieser Link zeigt.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Ein bereits konfigurierter Ordner beinhaltet den aktuell eingegebenen Ordner.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Der ausgewählte Ordner ist ein symbolischer Link. Ein bereits konfigurierter Ordner ist die Wurzel des aktuell ausgewählten Ordners, auf den der Link zeigt.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Der Alias darf nicht leer sein. Bitte ein anschauliches Alias-Wort eingeben.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>Der Alias <i>%1</i> wird bereits benutzt. Bitte wählen Sie einen anderen Alias.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Den Quellordner wählen</translation> </message> @@ -624,42 +637,47 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Entfernten Ordner erstellen</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <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="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Order erfolgreich auf %1 erstellt.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <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="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <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="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Dieser Ordner wird bereits synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <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="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Sie synchronisieren bereits alle Ihre Dateien. Die Synchronisation anderer Verzeichnisse wird <b>nicht</b> unterstützt. Wenn Sie mehrere Ordner synchronisieren möchten, entfernen Sie bitte das aktuell konfigurierte Wurzelverzeichnis zur Synchronisation.</translation> </message> @@ -667,7 +685,7 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Zu synchronisierende Elemente auswählen: Sie können optional Unterordner des Servers abwählen, die nicht synchronisiert werden sollen.</translation> </message> @@ -675,31 +693,35 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Warnung:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Server hat falschen Bereich für den Inhalt zurück gegeben</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Zeitüberschreitung der Verbindung</translation> </message> @@ -756,12 +778,12 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Passwort eingeben</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Bitte %1 Passwort für den Benutzer '%2' eingeben:</translation> </message> @@ -837,8 +859,8 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Suche:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -877,19 +899,19 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Log-Datei konnte nicht geschrieben werden</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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> @@ -897,7 +919,7 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Zeitüberschreitung bei der Verbindung</translation> </message> @@ -905,27 +927,27 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Eine neue Version ist verfügbar.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Eine neue Version des %1 - Klients ist verfügbar.</p><p><b>%2</b> steht zum Herunterladen bereit. Die installierte Version ist %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Diese Version auslassen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Dieses Mal überspringen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Update durchführen</translation> </message> @@ -1034,54 +1056,53 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Neue Aktualisierung steht bereit</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Eine neue Aktualiserung steht zur Installation bereit. Der Updater fragt evtl. -nach zusätzlichen Privilegien während des Prozesses.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Version %1 wird heruntergeladen. Bitte warten …</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Version %1 verfügbar. Anwendung zum Start der Aktualisierung neustarten.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Aktualisierung kann nicht herunter geladen werden. Bitte klicken Sie <a href='%1'>hier</a> um die Aktualisierung manuell herunter zu laden.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Auf neue Aktualisierungen kann nicht geprüft werden.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Neue Version %1 verfügbar. Bitte nutzen Sie das System-Updatetool zur Installation.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Aktualisierungsserver wird überprüft …</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Updatestatus unbekannt: Auf neue Updates wurde nicht geprüft.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Keine Aktualisierungen verfügbar. Ihre Installation ist die aktuelle Version.</translation> </message> @@ -1109,28 +1130,33 @@ nach zusätzlichen Privilegien während des Prozesses.</translation> <translation>%1 Ordner '%2' wird mit dem lokalen Ordner '%3' synchronisiert</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Warnung:</strong> Sie haben zur Zeit mehrere Ordner konfiguriert. Wenn Sie mit den aktuellen Einstellungen fortfahren, werden diese Einstellungen verworfen und eine vollständige Server-Synchronisation wird erstellt!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Achtung:</strong> Das lokale Verzeichnis ist nicht leer. Wähle eine entsprechende Lösung!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Lokaler Ordner für die Synchronisation</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Erweiterte Einstellungen aktualisieren</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1148,7 +1174,7 @@ nach zusätzlichen Privilegien während des Prozesses.</translation> <translation>Geben Sie die Benutzer-Anmeldeinformationen ein</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Aktualisieren Sie die Benutzer-Anmeldeinformationen</translation> </message> @@ -1191,129 +1217,139 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <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="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <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="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <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="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <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="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Erstellen eines lokalen Synchronisationsordners %1…</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>fehlgeschlagen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <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="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Keinen entfernten Ordner angegeben!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Fehler: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>erstelle Ordner auf ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Remoteordner %1 erfolgreich erstellt.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <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="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <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="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Erfolgreich verbunden mit %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <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="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Ordner umbenennen fehlgeschlagen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <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> @@ -1352,7 +1388,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Zeitüberschreitung der Verbindung</translation> </message> @@ -1360,7 +1396,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>Ungültige JSON-Antwort von der Poll-URL</translation> </message> @@ -1396,17 +1432,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Die Datei konnte nicht vollständig herunter geladen werden.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation> </message> @@ -1414,17 +1450,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Wiederherstellung fehlgeschlagen: </translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Blacklisting fortsetzen:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Eine Datei oder Verzeichnis wurde von einer Nur-Lese-Freigabe wiederhergestellt, aber die Wiederherstellung ist mit folgendem Fehler fehlgeschlagen: %1</translation> </message> @@ -1432,12 +1468,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <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="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>Verzeichnis %1 konnte nicht erstellt werden</translation> </message> @@ -1445,17 +1481,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Fehler beim Entfernen von '%1': %2; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Verzeichnis '%1' konnte nicht entfernt werden;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <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> @@ -1463,7 +1499,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <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> @@ -1471,45 +1507,45 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Die Datei wurde von einer Nur-Lese-Freigabe gelöscht. Die Datei wurde wiederhergestellt.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Falschen HTTP-Code vom Server zurückerhalten. Erwartet war 204, empfangen wurde aber „%1 %2“.</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Falschen HTTP-Code vom Server zurückerhalten. Erwartet war 201, empfangen wurde aber „%1 %2“.</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Dieser Ordner muss nicht umbenannt werden. Er wurde zurück zum Originalnamen umbenannt.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Dieser Ordner muss nicht umbenannt werden. Bitte benennen Sie es zurück wie in der Freigabe.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Die Datei wurde auf einer Nur-Lese-Freigabe umbenannt. Die Original-Datei wurde wiederhergestellt.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Falschen HTTP-Code vom Server zurückerhalten. Erwartet war 201, empfangen wurde aber „%1 %2“.</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1534,33 +1570,33 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Datei gelöscht</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>Poll-URL fehlt</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <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/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation> </message> @@ -1578,16 +1614,6 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <translation>Synchronisierungsaktivität</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Zeit</translation> @@ -1628,22 +1654,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <translation>Aktivitätsliste in die Zwischenablage kopieren.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>In die Zwischenablage kopiert</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Der Synchronisationsstatus wurde in die Zwischenablage kopiert.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>Aktuell werden keine Dateien, aufgrund vorheriger Fehler und keine laufenden Downloads, ignoriert.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>%n Datei wird aufgrund vorangegangener Fehler ignoriert. @@ -1652,7 +1678,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation> </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n Datei ist teilweise heruntergeladen. @@ -1660,7 +1686,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Versuchen, diese nochmals zu synchronisieren.</translation> </message> @@ -1668,22 +1694,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Nicht markierte Ordner werden von Ihrem lokalen Dateisystem <b>entfernt</b> und werden auch nicht mehr auf diesem Rechner synchronisiert</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Zu synchronisierende Elemente auswählen: Sie können Unterordner des Servers auswählen, die synchronisiert werden sollen.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Zu synchronisierende Elemente auswählen: Sie können Unterordner des Servers abwählen, die nicht synchronisiert werden sollen.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Zu synchronisierende Elemente auswählen</translation> </message> @@ -1691,20 +1717,31 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Laden…</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Name</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Größe</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1714,22 +1751,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <translation>Einstellungen</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Benutzerkonto</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Aktivität</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Allgemein</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Netzwerk</translation> </message> @@ -1737,27 +1774,27 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Benutzerkonto</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Aktivität</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Allgemein</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Netzwerk</translation> </message> @@ -1770,104 +1807,139 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <translation>Teile NewDocument.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Freigabe-Info</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>Freigabe-Label</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>ownCloud-Pfad:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Link teilen</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Passwort setzen</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Ablaufdatum setzen</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Passwort setzen</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1-Pfad: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>%1-Freigabe</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>passwortgeschützt</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Wählen Sie ein Passwort für den öffentlichen Link</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>OCS-API-Fehlercode: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Es ist kein Synchronisationsordner konfiguriert.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Es kann kein Ordner zum Hochladen gefunden werden.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>Das Teilen von externen Verzeichnissen funktioniert noch nicht.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Eine Sync-Datei dieses Namens existiert bereits. Die Datei kann nicht für die Synchronisation registriert werden.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>Das Teilen von externen Verzeichnissen funktioniert noch nicht.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Warten auf das Hochladen…</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Registrierung im Synchronisationsraum nicht möglich.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Die Datei kann nicht synchronisiert werden.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>Die Synchronisation der registrierten Datei war noch nicht erfolgreich.</translation> </message> @@ -1888,30 +1960,25 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Authentifikation</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Erneute Authentifizierung erforderlich</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Ihre Sitzung ist abgelaufen. Sie müssen sich zur weiteren Nutzung des Clients neu Anmelden.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Via %1 teilen</translation> @@ -1920,114 +1987,114 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Zertifikatdetails</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Gemeinsamer Name (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Subject Alternative Names:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organisation (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Organisationseinheit (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Staat/Provinz:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Land:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Seriennummer:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Aussteller</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Aussteller:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Ausgestellt am:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Ablaufdatum:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Fingerabdrücke</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Hinweis:</b> Dieses Zertifikat wurde manuell bestätigt</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (selbst signiert)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Diese Verbindung ist verschlüsselt mit %1 Bit %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Zertifikatsinformation:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Diese Verbindung ist NICHT sicher, da diese nicht verschlüsselt ist. @@ -2048,67 +2115,67 @@ Es ist nicht ratsam, diese zu benutzen.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL-Verbindung</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Warnungen zur aktuellen SSL-Verbindung</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>mit Zertifikat %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;nicht angegeben&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organisation: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Einheit: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Land: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Fingerabdruck (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Fingerabdruck (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Aktuelles Datum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Ablaufdatum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Aussteller: %1</translation> </message> @@ -2116,219 +2183,229 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Erfolgreich</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync konnte den Synchronisationsbericht nicht laden oder erstellen. Stellen Sie bitte sicher, dass Sie Lese- und Schreibrechte auf das lokale Synchronisationsverzeichnis haben.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>CSync konnte die Journaldatei nicht laden. Die Journaldatei ist beschädigt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Das %1-Plugin für csync konnte nicht geladen werden.<br/>Bitte überprüfen Sie die Installation!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync hatte einen Fehler bei der Verarbeitung von internen Strukturen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync konnte keinen Speicher reservieren.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>CSync hat einen schwerwiegender Parameterfehler festgestellt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSync Verarbeitungsschritt "Aktualisierung" fehlgeschlagen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync Verarbeitungsschritt "Abgleich" fehlgeschlagen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync konnte sich nicht am Proxy authentifizieren.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync konnte den Proxy oder Server nicht auflösen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync konnte sich nicht am Server %1 authentifizieren.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync konnte sich nicht mit dem Netzwerk verbinden.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Eine Zeitüberschreitung der Netzwerkverbindung ist aufgetreten.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Es hat sich ein HTTP-Übertragungsfehler ereignet.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync wegen fehlender Berechtigung fehlgeschlagen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync-Zugriff fehlgeschlagen</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync versuchte, ein Verzeichnis zu erstellen, welches bereits existiert.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Kein Platz auf Server %1 frei.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSync unbekannter Fehler.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Abbruch durch den Benutzer</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>Das eingehängte Verzeichnis ist auf dem Server vorübergehend nicht verfügbar</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Beim Öffnen eines Ordners ist ein Fehler aufgetreten</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Interne Fehlernummer %1 aufgetreten.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Das Element ist aufgrund vorheriger Fehler nicht synchronisiert: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Harte Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Die Datei ist in der Ignorierliste geführt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Die Datei beinhaltet ungültige Zeichen und kann nicht plattformübergreifend synchronisiert werden.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Dateikodierung ist ungültig</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Synchronisationsbericht kann nicht geöffnet werden</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Hauptordnern haben</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <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/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Löschen nicht erlaubt, Wiederherstellung</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Lokale Dateien und Freigabeordner wurden entfernt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Verschieben nicht erlaubt, da %1 schreibgeschützt ist</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>Das Ziel</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>Die Quelle</translation> </message> @@ -2336,7 +2413,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2344,17 +2421,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Version %1. Für weitere Informationen besuchen Sie bitte <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Copyright ownCloud, Incorporated</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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> </message> @@ -2459,7 +2536,8 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Jetzt abstürzen lassen</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2505,7 +2583,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Version %2. Weitere Informationen unter <a href="%3">%4</a></p><p><small>Von Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz und anderen.</small></p><p>Copyright ownCloud, Inc.</p><p>Lizensiert unter den Bedingungen der GNU General Public License (GPL) Version 2.0<br/>ownCloud und das ownCloud Logo sind eingetragene Warenzeichen der ownCloud Inc. in den USA, anderen Ländern, oder beidem.</p></translation> </message> @@ -2602,7 +2680,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <translation>Clientseitiges TLS-Zertifikat konfigurieren.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>Sichere Verbindung zur Server-Adresse <em>%1</em> fehlgeschlagen. Wie wollen Sie fortfahren?</p></body></html></translation> </message> @@ -2779,12 +2857,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Die Taskleiste ist nicht verfügbar.</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 benötigt ein funktionierendes Benachrichtigungsfeld. Falls Sie XFCE einsetzen, dann folgen Sie bitte <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">diesen Anweisungen</a>. Andernfalls installieren Sie bitte ein Benachrichtigungsfeld wie zum Beispiel „Trayer“ und versuchen es nochmal.</translation> </message> @@ -2792,82 +2870,87 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Erstellt aus Git-Revision <a href="%1">%2</a> vom %3, %4 mit Qt %5.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Heruntergeladen</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Hochgeladen</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Gelöscht</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Verschoben nach %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Ignoriert</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Zugriffsfehler im Dateisystem</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Unbekannt</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>Herunterladen</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>Lade hoch</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>Lösche</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>Verschiebe</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>ignoriere</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>Fehler</translation> </message> @@ -2875,52 +2958,52 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Status undefiniert</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Warte, um mit der Synchronistation zu beginnen</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Sync läuft</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Sync erfolgreich</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <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="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Synchronisationsfehler</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Installationsfehler</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Synchronisation wird vorbereitet</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Es wird abgebrochen …</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Synchronisation wurde angehalten</translation> </message> diff --git a/translations/client_el.ts b/translations/client_el.ts index e72c2c14f..81392b412 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -30,27 +30,27 @@ <translation>Φόρμα</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Επιλέξτε έναν απομακρυσμένο φάκελο προορισμού</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Δημιουργία Φακέλου</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Ανανέωση </translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Φάκελοι</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -134,60 +134,60 @@ <translation>Συνέχεια</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Επιβεβαίωση Αφαίρεσης Φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Θέλετε στ' αλήθεια να σταματήσετε το συγχρονισμό του φακέλου <i>%1</i>;</p><p><b>Σημείωση:</b> Αυτό δεν θα αφαιρέσει τα αρχεία από το δέκτη.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Επιβεβαίωση Επαναφοράς Φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Θέλετε στ' αλήθεια να επαναφέρετε το φάκελο <i>%1</i> και να επαναδημιουργήσετε τη βάση δεδομένων του δέκτη;</p><p><b>Σημείωση:</b> Αυτή η λειτουργία έχει σχεδιαστεί αποκλειστικά για λόγους συντήρησης. Κανένα αρχείο δεν θα αφαιρεθεί, αλλά αυτό μπορεί να προκαλέσει σημαντική κίνηση δεδομένων και να πάρει αρκετά λεπτά ή ώρες μέχρι να ολοκληρωθεί, ανάλογα με το μέγεθος του φακέλου. Χρησιμοποιείστε αυτή την επιλογή μόνο εάν έχετε συμβουλευτεί αναλόγως από το διαχειριστή σας.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Εκτελείται Συγχρονισμός </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <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="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Εντοπισμός '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 από %4) %5 απομένουν με ταχύτητα %6/δευτ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 από %2, αρχείο %3 από%4 @@ -195,37 +195,37 @@ Total time left %5</source> Συνολικός χρόνος που απομένει %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>αρχείο %1 από %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) από %2 αποθηκευτικός χώρος διακομιστή σε χρήση.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Συνδεδεμένοι με <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Συνδεδεμένοι με <a href="%1">%2</a> ως <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Δεν υπάρχει σύνδεση με %1 στο <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Δεν έχει ρυθμιστεί σύνδεση με το %1.</translation> </message> @@ -258,12 +258,12 @@ Total time left %5</source> <translation>Πιστοποιήστε τον κωδικό :</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Επιλέξτε ένα πιστοποιητικό.</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Πιστοποιήστε τα αρχεία (*.p12 *.pfx)</translation> </message> @@ -294,33 +294,38 @@ Total time left %5</source> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Δεν έχει ρυθμιστεί λογαριασμός ownCloud</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Ο ρυθμισμένος διακομιστής για αυτό το δέκτη είναι πολύ παλιός</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Παρακαλώ ενημερώστε το διακομιστή στη νεώτερη έκδοση και επανεκκινήστε το δέκτη.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Αδυναμία σύνδεσης με %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>παρέλευση χρονικού ορίου</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Τα παρεχόμενα διαπιστευτήρια δεν είναι σωστά</translation> </message> @@ -328,30 +333,38 @@ Total time left %5</source> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Λήξη χρόνου σύνδεσης.</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Αδυναμία δημιουργίας csync-context</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>Ο %1 θα έπρεπε να είναι κατάλογος αρχείων αλλά δεν είναι.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation> Το %1 δεν είναι αναγνώσιμο. </translation> </message> @@ -465,62 +478,62 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Απροσδιόριστη Κατάσταση.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Αναμονή έναρξης συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Προετοιμασία για συγχρονισμό.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Ο συγχρονισμός εκτελείται.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Σφάλμα Ρύθμισης.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Ματαίωση από Χρήστη.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Παύση συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Παύση συγχρονισμού)</translation> </message> @@ -547,8 +560,8 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Προσθήκη Φακέλου</translation> </message> @@ -556,67 +569,67 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Κλικάρετε για να επιλέξετε έναν τοπικό φάκελο προς συγχρονισμό.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Εισάγετε τη διαδρομή προς τον τοπικό φάκελο.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>Το όνομα καταλόγου είναι ένα περιγραφικό όνομα για αυτή τη σύνδεση συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Δεν επιλέχθηκε έγκυρος τοπικός φάκελος!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Η τοπική διαδρομή %1 είναι ήδη ένας φάκελος μεταφόρτωσης. Παρακαλώ επιλέξτε κάποιον άλλο!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Ένας ήδη ρυθμισμένος φάκελος περιέχεται στην τρέχουσα καταχώρηση.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Ο επιλεγμένος φάκελος είναι ένας συμβολικός σύνδεσμος. Ένας ήδη ρυθμισμένος φάκελος περιέχεται στο φάκελο στον οποίο καταλήγει αυτός ο σύνδεσμος.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Ένας ήδη ρυθμισμένος φάκελος περιέχει τον φάκελο που μόλις επιλέξατε. </translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Ο επιλεγμένος φάκελος είναι ένας συμβολικός σύνδεσμος. Ο φάκελος στον οποίο οδηγεί ο σύνδεσμος περιέχεται σε έναν φάκελο που είναι ήδη ρυθμισμένος.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Το ψευδώνυμο δεν μπορεί να είναι κενό. Παρακαλώ δώστε μια περιγραφική λέξη ψευδωνύμου.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>Το ψευδώνυμο <i>%1</i> είναι ήδη σε χρήση. Παρακαλώ επιλέξτε άλλο ψευδώνυμο.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Επιλογή του φακέλου προέλευσης</translation> </message> @@ -624,42 +637,47 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Δημιουργία Απομακρυσμένου Φακέλου</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <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="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Επιτυχής δημιουργία φακέλου στο %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Αποτυχία δημιουργίας φακέλου στο %1. Παρακαλώ ελέγξτε χειροκίνητα.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Επιλέξτε να συγχρονίσετε ολόκληρο το λογαριασμό</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Αυτός ο φάκελος συγχρονίζεται ήδη.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <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="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Συγχρονίζετε ήδη όλα σας τα αρχεία. Ο συγχρονισμός ενός ακόμα φακέλου <b>δεν</b> υποστηρίζεται. Εάν θέλετε να συγχρονίσετε πολλαπλούς φακέλους, παρακαλώ αφαιρέστε την τρέχουσα ρύθμιση συχρονισμού του βασικού φακέλου.</translation> </message> @@ -667,7 +685,7 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Επιλέξτε Τι θα Συγχρονιστεί: Μπορείτε προαιρετικά να καταργήστε την επιλογή υποφακέλων που δεν επιθυμείτε να συγχρονίσετε.</translation> </message> @@ -675,31 +693,35 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Προειδοποίηση:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Δεν ελήφθη E-Tag από το διακομιστή, ελέγξτε το διακομιστή μεσολάβησης/πύλη</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Ο διακομιστής επέστρεψε εσφαλμένο πεδίο τιμών</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation> </message> @@ -756,12 +778,12 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Εισάγετε Κωδικό Πρόσβασης</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Παρακαλώ εισάγετε τον κωδικό %1 για το χρήστη '%2':</translation> </message> @@ -837,8 +859,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Αναζήτηση:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -877,19 +899,19 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Δεν ήταν δυνατή η εγγραφή στο αρχείο συμβάντων</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Σφάλμα</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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> @@ -897,7 +919,7 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Η σύνδεση έληξε.</translation> </message> @@ -905,27 +927,27 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Νέα Έκδοση Διαθέσιμη </translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Παράλειψη αυτής της έκδοσης</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Παράλειψη αυτή τη φορά</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Λήψη ενημέρωσης</translation> </message> @@ -1034,54 +1056,53 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Νέα Ενημέρωση Διαθέσιμη</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Μια νέα ενημέρωση πρόκειται να εγκατασταθεί. Ο βοηθός ενημέρωσης μπορεί να ζητήσει -επιπλέον παραχωρήσεις δικαιωμάτων κατά τη διαδικασία.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Λήψη έκδοσης %1. Παρακαλώ περιμένετε...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Η έκδοση %1 είναι διαθέσιμη. Επανεκκινήστε την εφαρμογή για να ξεκινήσει η ενημέρωση.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Αδυναμία λήψης της ενημέρωσης. Παρακαλώ κλικάρετε <a href='%1'>εδώ</a> για να κατεβάσετε την ενημέρωση χειροκίνητα.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Αδυναμία ελέγχου για νέες ενημερώσεις.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Νέα έκδοση του %1 είναι διαθέσιμη. Παρακαλώ χρησιμοποιήστε το εργαλείο ενημερώσεων του συστήματος για να την εγκαταστήσετε.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Έλεγχος διακομιστή ενημερώσεων...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Η κατάσταση ενημέρωσης είναι άγνωστη: Δεν έγινε έλεγχος για για νέες ενημερώσεις.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Δεν υπάρχουν ενημερώσεις διαθέσιμες. Η εγκατάστασή σας βρίσκεται στην τελευταία έκδοση.</translation> </message> @@ -1109,28 +1130,33 @@ for additional privileges during the process.</source> <translation>Ο %1 φάκελος '%2' είναι συγχρονισμένος με τον τοπικό φάκελο '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Προειδοποίηση:</strong> Επί του παρόντος έχετε ρυθμισμένους πολλαπλούς φακέλους. Εάν συνεχίσετε με τις παρούσες ρυθμίσεις, οι ρυθμίσεις φακέλων θα απορριφθούν και ένας μοναδικός φάκελος ρίζας για συγχρονισμό θα δημιουργηθεί!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory 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="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Τοπικός Φάκελος Συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Ενημέρωση προχωρημένων ρυθμίσεων</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1148,7 +1174,7 @@ for additional privileges during the process.</source> <translation>Εισάγετε διαπιστευτήρια χρήστη</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Ενημέρωση διαπιστευτηρίων χρήστη</translation> </message> @@ -1191,129 +1217,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <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="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <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="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Λήξη χρονικού ορίου κατά τη σύνδεση σε %1 σε %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Προσπάθεια σύνδεσης στο %1 για %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Δημιουργία τοπικού φακέλου %1 για συγχρονισμό... </translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>οκ</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>απέτυχε.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>Αδυναμία δημιουργίας τοπικού φακέλου %1 </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Δεν προσδιορίστηκε κανένας απομακρυσμένος φάκελος!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Σφάλμα: %1 </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>δημιουργία φακέλου στο ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Ο απομακρυσμένος φάκελος %1 δημιουργήθηκε με επιτυχία.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Ο απομακρυσμένος φάκελος %1 υπάρχει ήδη. Θα συνδεθεί για συγχρονισμό. </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Η δημιουργία φακέλου είχε ως αποτέλεσμα τον κωδικό σφάλματος HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Επιτυχής σύνδεση με %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Αδυναμία σύνδεσης στον %1. Παρακαλώ ελέξτε ξανά.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Αποτυχία μετονομασίας φακέλου</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Επιτυχής δημιουργία τοπικού φακέλου %1 για συγχρονισμό!</b></font></translation> </message> @@ -1352,7 +1388,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation> </message> @@ -1360,7 +1396,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>Λανθασμένη απάντηση JSON από την ιστοσελίδα poll</translation> </message> @@ -1396,17 +1432,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Η λήψη του αρχείου δεν ολοκληρώθηκε.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation> </message> @@ -1414,17 +1450,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation> - Η αποκατάσταση Απέτυχε:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Συνέχεια μαύρη λίστα:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Ένα αρχείο ή ένας κατάλογος αφαιρέθηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση, αλλά η επαναφορά απέτυχε: %1</translation> </message> @@ -1432,12 +1468,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Προσοχή, πιθανή διένεξη κεφαλαίων-πεζών γραμάτων με το %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>αδυναμία δημιουργίας καταλόγου %1</translation> </message> @@ -1445,17 +1481,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Σφάλμα αφαίρεσης '%1': %2;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Αδυναμία αφαίρεσης καταλόγου '%1';</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Δεν ήταν δυνατή η αφαίρεση του %1 λόγω διένεξης με το όνομα ενός τοπικού αρχείου</translation> </message> @@ -1463,7 +1499,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Το αρχείο %1 δεν είναι δυνατό να μετονομαστεί σε %2 λόγω μιας διένεξης με το όνομα ενός τοπικού αρχείου</translation> </message> @@ -1471,45 +1507,45 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Το αρχείο αφαιρέθηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση. Το αρχείο επαναφέρθηκε.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 204, ελήφθη "%1 %2".</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 201, ελήφθη "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Μετονομάζεται πίσω στο αρχικό του όνομα.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Παρακαλώ ονομάστε τον ξανά Κοινόχρηστος.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Το αρχείο μετονομάστηκε αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Το αρχικό αρχείο επαναφέρθηκε.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 201, ελήφθη "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1534,33 +1570,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Το αρχείο αφαιρέθηκε</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και το επεξεργασμένο βρίσκεται στο αρχείο συγκρούσεων.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>Η διεύθυνση poll URL λείπει</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation> </message> @@ -1578,16 +1614,6 @@ It is not advisable to use it.</source> <translation>Δραστηριότητα Συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Ώρα</translation> @@ -1628,22 +1654,22 @@ It is not advisable to use it.</source> <translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Αντιγράφηκε στο πρόχειρο</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Η κατάσταση συγχρονισμού αντιγράφηκε στο πρόχειρο.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>Προς το παρόν κανένα αρχείο δεν θα αγνοηθεί λόγω προηγούμενων σφαλμάτων και δεν υπάρχουν λήψεις σε εξέλιξη.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>%n αρχεία αγνοήθηκαν λόγω προηγούμενων σφαλμάτων. @@ -1653,7 +1679,7 @@ It is not advisable to use it.</source> </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n αρχεία λήφθηκαν μερικώς. @@ -1661,7 +1687,7 @@ It is not advisable to use it.</source> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Προσπάθεια για συγχρονισμό αυτών ξανά.</translation> </message> @@ -1669,22 +1695,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Οι μη επιλεγμένοι φάκελοι θα <b>αφαιρεθούν</ b> από το τοπικό σύστημα αρχείων σας και δεν θα συγχρονιστούν πια με αυτόν τον υπολογιστή</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Επιλέξτε Τι θα Συγχρονιστεί: Επιλέξτε τους απομακρυσμένους υποφακέλους που επιθυμείτε να συγχρονίσετε.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Επιλέξτε Τι θα Συγχρονιστεί: Επιλέξτε τους απομακρυσμένους υποφακέλους που δεν επιθυμείτε να συγχρονίσετε.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Επιλέξτε Τι θα Συγχρονιστεί</translation> </message> @@ -1692,20 +1718,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Φόρτωση ...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Όνομα</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Μέγεθος</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1715,22 +1752,22 @@ It is not advisable to use it.</source> <translation>Ρυθμίσεις</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Λογαριασμός</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Δραστηριότητα</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Γενικά</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Δίκτυο</translation> </message> @@ -1738,27 +1775,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Λογαριασμός</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Δραστηριότητα</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Γενικά</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Δίκτυο</translation> </message> @@ -1771,104 +1808,139 @@ It is not advisable to use it.</source> <translation>Διαμοιρασμός NewDocument.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Διαμοιρασμός Πληροφοριών</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>Διαμοιρασμός ετικέτας</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>Διαδρομή ownCloud:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Διαμοιρασμός συνδέσμου</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Ορισμός κωδικού πρόσβασης</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Ορισμός ημερομηνίας λήξης</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Ορισμός κωδικού πρόσβασης</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1 διαδρομή: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>%1 Διαμοιράστηκε</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Προστατευμένο με κωδικό πρόσβασης</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Επιλέξτε κωδικό για τον δημόσιο σύνδεσμο</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>OCS API κωδικός λάθους: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Δεν έχει οριστεί φάκελος συνχρονισμού.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Δεν βρέθηκε φάκελος για την προσθήκη αρχείου.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>Ο διαμοιρασμός εξωτερικών καταλόγων δεν λειτουργεί ακόμα.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Ήδη υπάρχει αρχείο συγχρονισμού με το ίδιο όνομα. Το αρχείο δεν μπορεί να καταχωρηθεί προς συγχρονισμό.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>Ο διαμοιρασμός εξωτερικών καταλόγων δεν λειτουργεί ακόμα.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Αναμονή για μεταφόρτωση</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Αδυναμία καταχώρησης στο χώρο συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Το αρχείο δεν μπορεί να συγχρονιστεί.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>Ο συγχρονισμός του καταχωρημένου αρχείου δεν πέτυχε ακόμη.</translation> </message> @@ -1889,30 +1961,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Πιστοποίηση</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Απαιτείται επανάληψη πιστοποίησης</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Η συνεδρία σας έληξε. Πρέπει να εισέλθετε ξανά για να συνεχίσετε να χρησιμοποιείτε το πρόγραμμα.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Διαμοιρασμός με %1</translation> @@ -1921,114 +1988,114 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Λεπτομέρειες Πιστοποιητικού</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Κοινό Όνομα (ΚΟ):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Εναλλακτικά Ονόματα Υποκειμένου:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Οργανισμός (Ο):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Μονάδα Οργανισμού (ΜΟ):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Νομός/Περιφέρεια:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Χώρα:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Σειριακός αριθμός:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Εκδότης</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Εκδότης:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Εκδόθηκε στις:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Λήγει στις:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Αποτυπώματα</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation>p><b>Σημείωση:</b> Αυτό το πιστοποιητικό εγκρίθηκε χειροκίνητα</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (αυτό-πιστοποιημένο)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Η σύνδεση είναι κρυπτογραφημένη με %1 bit %2 </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Πληροφορίες πιστοποιητικού:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Αυτή η σύνδεση δεν είναι ασφαλής καθώς δεν είναι κρυπτογραφημένη. @@ -2049,67 +2116,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>Σύνδεση SSL</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Προειδοποιήσεις σχετικά με την τρέχουσα σύνδεση SSL:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>με Πιστοποιητικό: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;δεν κατονομάζονται&gt; </translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Οργανισμός: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Μονάδα: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Χώρα: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Αποτύπωμα (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Αποτύπωμα (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Ημερομηνία Έναρξης: 1%</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Ημερομηνία Λήξης: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Εκδότης: %1</translation> </message> @@ -2117,219 +2184,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Επιτυχία.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>Το CSync απέτυχε να φορτώσει ή να δημιουργήσει το αρχείο καταλόγου. Βεβαιωθείτε ότι έχετε άδειες ανάγνωσης και εγγραφής στον τοπικό κατάλογο συγχρονισμού.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>Το CSync απέτυχε να φορτώσει ο αρχείο καταλόγου. Το αρχείο καταλόγου έχει καταστραφεί.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Το πρόσθετο του %1 για το csync δεν μπόρεσε να φορτωθεί.<br/>Παρακαλούμε επαληθεύσετε την εγκατάσταση!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>Το CSync έλαβε κάποιο μήνυμα λάθους κατά την επεξεργασία της εσωτερικής διεργασίας.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>Το CSync απέτυχε να δεσμεύσει μνήμη.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>Μοιραίο σφάλμα παράμετρου CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>Η ενημέρωση του βήματος επεξεργασίας του CSync απέτυχε.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync στάδιο επεξεργασίας συμφιλίωση απέτυχε. </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>Το CSync δεν μπόρεσε να πιστοποιηθεί στο διακομιστή μεσολάβησης.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>Το CSync απέτυχε να διερευνήσει το διαμεσολαβητή ή το διακομιστή.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>Το CSync απέτυχε να πιστοποιηθεί στο διακομιστή 1%. </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>Το CSync απέτυχε να συνδεθεί με το δίκτυο.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Διακοπή σύνδεσης δικτύου λόγω παρέλευσης χρονικού ορίου.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Ένα σφάλμα μετάδοσης HTTP συνέβη.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>Το CSync απέτυχε λόγω απόρριψης μη-διαχειρίσιμων δικαιωμάτων.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>Το CSync απέτυχε να αποκτήσει πρόσβαση</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>Το CSync προσπάθησε να δημιουργήσει ένα κατάλογο που υπάρχει ήδη.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Δεν υπάρχει διαθέσιμος χώρος στο διακομιστή 1%.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>Άγνωστο σφάλμα CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Ματαιώθηκε από το χρήστη</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>Ο προσαρτημένος κατάλογος δεν είναι προσωρινά διαθέσιμος στον δικομιστή</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Ένα σφάλμα συνέβη κατά το άνοιγμα ενός καταλόγου.</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Συνέβη εσωτερικό σφάλμα με αριθμό %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Οι συνδέσεις υλικού δεν υποστηρίζονται για συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας "διάλεξε τι να συγχρονιστεί"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υπο-καταλόγους σε αυτό τον κατάλογο</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε στο γονεϊκό κατάλογο</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Δεν επιτρέπεται επειδή δεν έχεται δικαιώματα να προσθέσετε αρχεία σε αυτόν τον κατάλογο</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <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/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>ο προορισμός</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>η προέλευση</translation> </message> @@ -2337,7 +2414,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2345,17 +2422,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Έκδοση %1. Για περισσότερες πληροφορίες δείτε <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Πνευματικά δικαιώματα ownCloud, Ανώνυμη Εταιρία</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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> @@ -2460,7 +2537,8 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Κατάρρευση τώρα</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2506,7 +2584,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Έκδοση %2. Για περισσότερες πληροφορίες επισκεφθείτε <a href="%3">%4</a></p><p><small>Των Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz και άλλων.</small></p><p>Πνευματικά δικαιώματα ownCloud, Inc.</p><p>Αδειοδότηση υπό την GNU General Public License (GPL) Έκδοση 2.0<br/>το ownCloud και το λογότυπο ownCloud είναι σήματα κατατεθέντα της ownCloud, Inc. στις Η.Π.Α., σε άλλες χώρες ή και στα δύο</p></translation> </message> @@ -2603,7 +2681,7 @@ It is not advisable to use it.</source> <translation>Διαμόρφωση πιστοποιητικού TLS του δέκτη</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p> Αποτυχία σύνδεσης με ασφαλή διεύθυνση του διακομιστή <em>%1</em>. Πώς θέλετε να συνεχίσετε;</p></body></html></translation> </message> @@ -2780,12 +2858,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Μπάρα Συστήματος μη-διαθέσιμη</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>Το %1 απαιτεί μια μπάρα συστήματος σε λειτουργία. Εάν χρησιμοποιείτε το XFCE, παρακαλώ ακολουθείστε <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">αυτές τις οδηγίες</a>. Διαφορετικά, παρακαλώ εγκαταστείστε μια εφαρμογή μπάρας συστήματος όπως η 'trayer' και δοκιμάστε ξανά.</translation> </message> @@ -2793,82 +2871,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Δημιουργήθηκε από την διασκευή Git <a href="%1">%2</a> στο %3, %4 χρησιμοποιώντας Qt %5.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Ελήφθη</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Μεταφορτώθηκε</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Διεγράφη</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Μετακινήθηκαν στο %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Αγνοήθηκε</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Σφάλμα πρόσβασης στο σύστημα αρχείων</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Σφάλμα</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Άγνωστο</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>λήψη</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>μεταφόρτωση</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>διαγραφή</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>μετακίνηση</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>αγνοείται</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>σφάλμα </translation> </message> @@ -2876,52 +2959,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Απροσδιόριστη κατάσταση</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Αναμονή έναρξης συγχρονισμού</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Ο συγχρονισμός εκτελείται</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Επιτυχημένος Συγχρονισμός</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation>Επιτυχία Συγχρονισμού, κάποια αρχεία αγνοήθηκαν.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Σφάλμα Συγχρονισμού</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Σφάλμα Ρυθμίσεων</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Προετοιμασία για συγχρονισμό</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Ματαίωση σε εξέλιξη...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Παύση συγχρονισμού</translation> </message> diff --git a/translations/client_en.ts b/translations/client_en.ts index cc50fc0da..a915262af 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -32,27 +32,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> @@ -136,96 +136,96 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation type="unfinished"></translation> </message> @@ -258,12 +258,12 @@ Total time left %5</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation type="unfinished"></translation> </message> @@ -294,33 +294,38 @@ Total time left %5</source> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation type="unfinished"></translation> </message> @@ -328,30 +333,38 @@ Total time left %5</source> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation type="unfinished"></translation> </message> @@ -463,62 +476,62 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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 type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"></translation> </message> @@ -545,8 +558,8 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation type="unfinished"></translation> </message> @@ -554,67 +567,67 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation type="unfinished"></translation> </message> @@ -622,42 +635,47 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation type="unfinished"></translation> </message> @@ -665,7 +683,7 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"></translation> </message> @@ -673,31 +691,35 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation type="unfinished"></translation> </message> @@ -754,12 +776,12 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation type="unfinished"></translation> </message> @@ -833,7 +855,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> + <source>&Search:</source> <translation type="unfinished"></translation> </message> <message> @@ -873,19 +895,19 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> + <source>Could not write to log file %1</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation type="unfinished"></translation> </message> @@ -893,7 +915,7 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation type="unfinished"></translation> </message> @@ -901,27 +923,27 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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 type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation type="unfinished"></translation> </message> @@ -1030,53 +1052,53 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation type="unfinished"></translation> </message> @@ -1104,28 +1126,33 @@ for additional privileges during the process.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation type="unfinished"></translation> </message> @@ -1143,7 +1170,7 @@ for additional privileges during the process.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation type="unfinished"></translation> </message> @@ -1185,129 +1212,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> - <source>Creating local sync folder %1... </source> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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 type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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 type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation type="unfinished"></translation> </message> @@ -1346,7 +1383,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation type="unfinished"></translation> </message> @@ -1354,7 +1391,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"></translation> </message> @@ -1390,17 +1427,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"></translation> </message> @@ -1408,17 +1445,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"></translation> </message> @@ -1426,12 +1463,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation type="unfinished"></translation> </message> @@ -1439,17 +1476,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation type="unfinished"></translation> </message> @@ -1457,7 +1494,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation type="unfinished"></translation> </message> @@ -1465,44 +1502,44 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"></translation> </message> </context> @@ -1528,33 +1565,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation type="unfinished"></translation> </message> @@ -1572,16 +1609,6 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation type="unfinished"></translation> @@ -1622,22 +1649,22 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"> @@ -1646,7 +1673,7 @@ It is not advisable to use it.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"> @@ -1655,7 +1682,7 @@ It is not advisable to use it.</source> </translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation type="unfinished"></translation> </message> @@ -1663,22 +1690,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation type="unfinished"></translation> </message> @@ -1686,20 +1713,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1709,22 +1747,22 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation type="unfinished"></translation> </message> @@ -1732,27 +1770,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation type="unfinished"></translation> </message> @@ -1765,104 +1803,139 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> + <source>TextLabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> - <source>TextLabel</source> + <location filename="../src/gui/sharedialog.ui" line="41"/> + <source>share label</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> - <source>share label</source> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> - <source>Waiting to upload...</source> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> - <source>Unable to register in sync space.</source> + <location filename="../src/gui/sharedialog.cpp" line="608"/> + <source>Waiting to upload...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> + <location filename="../src/gui/sharedialog.cpp" line="610"/> + <source>Unable to register in sync space.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"></translation> </message> @@ -1883,30 +1956,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"></translation> @@ -1915,113 +1983,113 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation type="unfinished"></translation> @@ -2041,67 +2109,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation type="unfinished"></translation> </message> @@ -2109,219 +2177,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation type="unfinished"></translation> </message> @@ -2329,7 +2407,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation type="unfinished"></translation> </message> @@ -2337,17 +2415,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 type="unfinished"></translation> </message> @@ -2452,6 +2530,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"></translation> </message> <message> @@ -2498,7 +2577,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"></translation> </message> @@ -2595,7 +2674,7 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"></translation> </message> @@ -2772,12 +2851,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"></translation> </message> @@ -2785,82 +2864,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"></translation> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation type="unfinished"></translation> </message> @@ -2868,52 +2952,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation type="unfinished"></translation> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index 9b4db4c3b..9c0d61ceb 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -30,27 +30,27 @@ <translation>Formulario</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Seleccionar una carpeta remota de destino</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Crear carpeta</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Actualizar</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Carpetas</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> @@ -134,97 +134,97 @@ <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Confirmar la eliminación de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>¿Realmente desea dejar de sincronizar la carpeta <i>%1</i>?</p><p><b>Nota:</b> Esto no eliminará los archivos de su cliente.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Confirme que desea restablecer la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>¿Realmente desea restablecer la carpeta <i>%1</i> y reconstruir la base de datos de cliente?</p><p><b>Nota:</b> Esta función es para mantenimiento únicamente. No se eliminarán archivos, pero se puede causar alto tráfico en la red y puede tomar varios minutos u horas para terminar, dependiendo del tamaño de la carpeta. Únicamente utilice esta opción si así lo indica su administrador.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La sincronización está en curso.<br/>¿Desea interrumpirla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Descubriendo '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 de %4) quedan %5 a una velocidad de %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 de %2, archivo %3 de %4 Tiempo restante %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) de %2 espacio usado en el servidor.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Conectado a <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>No hay conexión a %1 en <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>No hay ninguna conexión de %1 configurada.</translation> </message> @@ -257,12 +257,12 @@ Tiempo restante %5</translation> <translation>Contraseña del certificado:</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Seleccione un certificado</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Archivos de certificado (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Tiempo restante %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>No se ha configurado ninguna cuenta de ownCloud</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>La configuración del servidor al cliente es obsoleta</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Por favor, actualice a la última versión del servidor y reinicie el cliente</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Imposible conectar a %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>tiempo de espera</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Las credenciales proporcionadas no son correctas</translation> </message> @@ -327,30 +332,38 @@ Tiempo restante %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Tiempo de conexión agotado</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Imposible crear csync-context</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>La carpeta local %1 no existe.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 debería ser un directorio, pero no lo es.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 es ilegible.</translation> </message> @@ -464,62 +477,62 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>No se ha podido restablecer el estado de la carpeta</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>Se ha encontrado un antiguo registro de sincronización '%1'; pero no se ha podido eliminar. Por favor, asegúrese de que ninguna aplicación la esté utilizando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Estado no definido.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Esperando el inicio de la sincronización.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Preparándose para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Sincronización en funcionamiento.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>La última sincronización fue exitosa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>La última sincronización salió bien; pero hay advertencias para archivos individuales.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Error de configuración.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Interrumpido por el usuario.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>La sincronización está en pausa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sincronización en pausa)</translation> </message> @@ -546,8 +559,8 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Añadir carpeta</translation> </message> @@ -555,67 +568,67 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Haga clic para seleccionar una carpeta local para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Ingrese la ruta de la carpeta local.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>El alias de la carpeta es un nombre descriptivo para esta conexión de sincronización.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>¡No se ha seleccionado ninguna carpeta local válida!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>¡Usted no tiene permiso para escribir en la carpeta seleccionada!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>La ruta local %1 ya es una carpeta de subidas. Por favor, seleccione otra</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Ya hay una carpeta configurada dentro de la entrada actual.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>La carpeta seleccionada es un enlace simbólico. Ya existe una carpeta configurada en la carpeta a la que apunta este enlace.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Una carpeta ya configurada contiene la carpeta introducida.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>La carpeta seleccionada es un enlace simbólico. La carpeta raiz actualmente configurada ya contiene la carpeta seleccionada en su jerarquía.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>El alias no puede estar en blanco. Por favor, proporcione un alias descriptivo.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>El alias <i>%1</i> está en uso. Por favor, introduzca otro.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Seleccione la carpeta de origen</translation> </message> @@ -623,42 +636,47 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Crear carpeta remota</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Introduzca más abajo el nombre de la nueva carpeta que crear '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>La carpeta fue creada con éxito en %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Fallo al crear la carpeta %1. Por favor, revíselo manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Elija esto para sincronizar la cuenta entera</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Este directorio ya se ha sincronizado.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Ya ha sincronizado <i>%1</i>, el cual es la carpeta de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Todavía se están sincronizando ficheros. <b>No</b> se admite la sincronización de otras carpetas. Si quiere sincronizar múltiples carpetas, por favor revise la carpeta raíz configurada.</translation> </message> @@ -666,7 +684,7 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Elija qué sinconizar: Opcionalmente puede deseleccionar subcarpetas remotas que no desee sincronizar</translation> </message> @@ -674,31 +692,35 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Atención:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>No se recibió ninguna e-tag del servidor, revise el proxy/gateway</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Se recibió una e-tag distinta para reanudar. Se intentará nuevamente.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>El servidor devolvió un content-range erróneo</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Tiempo de espera de conexión agotado</translation> </message> @@ -755,12 +777,12 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Introduzca la contraseña</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Por favor, introduzca la contraseña de %1 para el usuario '%2':</translation> </message> @@ -836,8 +858,8 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Buscar:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>No se pudo escribir al archivo de registro</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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>Archivo '%1'<br/>no se puede abrir para escritura.<br/><br/>¡El archivo de registro <b>no</b> puede ser guardado!</nobr></translation> </message> @@ -896,7 +918,7 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Tiempo de conexión agotado</translation> </message> @@ -904,27 +926,27 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Nueva versión disponible</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Está disponible una nueva versión del programa cliente de %1.</p><p><b>%2</b> puede ser descargada. La versión instalada es %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Saltarse esta versión</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Omitir esta vez</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Actualizar</translation> </message> @@ -1033,53 +1055,53 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>La siguiente actualización está lista</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Está a punto de instalarse una nueva actualización. Puede que el gestor de actualizaciones pida privilegios adicionales durante el proceso.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Descargando la versión %1. Espere...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Versión %1 disponible. Reinicie la aplicación para comenzar con la actualización.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>No se puede descargar la actualización. Por favor, haga clic <a href='%1'>aquí</a> para iniciar una descarga manual.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>No se puede comprobar si hay actualizaciones.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>La nueva versión %1 está disponible. Use la herramienta de actualización de su sistema para instalarla.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Verificando el servidor de actualización...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Estado de actualización desconocido: no se buscaron nuevas actualizaciones.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>No hay actualizaciones disponibles. Tiene la última versión.</translation> </message> @@ -1107,28 +1129,33 @@ for additional privileges during the process.</source> <translation>La carpeta %1 '%2' está sincronizada con la carpeta local '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Advertencia:</strong>Tiene actualmente múltiples carpetas configuradas. Si continúa con los ajustes actuales, ¡la carpeta de configuración se descartará y se creará una única carpeta principal!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Advertencia:</strong>El directorio local no está vacío. ¡Seleccione otra!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Carpeta local de sincronización</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Actualizar configuración avanzada</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1146,7 +1173,7 @@ for additional privileges during the process.</source> <translation>Introduzca las credenciales de usuario</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Actualizar credenciales</translation> </message> @@ -1189,129 +1216,139 @@ No se recomienda usarla.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Conectado con éxito a %1: versión %2 %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Fallo al conectar %1 a %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Tiempo de espera agotado mientras se intentaba conectar a %1 en %2</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Intentando conectar a %1 desde %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Creando la carpeta de sincronización local %1...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>bien</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>falló.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>No se pudo crear carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>¡No se ha especificado ninguna carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>creando carpeta en ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Carpeta remota %1 creado correctamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <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="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta causó un error HTTP de código %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>¡Conectado con éxito a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Conexión a %1 no se pudo establecer. Por favor compruebelo de nuevo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Error al renombrar la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <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> @@ -1350,7 +1387,7 @@ No se recomienda usarla.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Tiempo de espera de conexión agotado</translation> </message> @@ -1358,7 +1395,7 @@ No se recomienda usarla.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>Respuesta JSON invalida desde URL</translation> </message> @@ -1394,17 +1431,17 @@ No se recomienda usarla.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>¡El archivo %1 no se puede descargar a causa de un conflicto con el nombre de un archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>No se pudo descargar el archivo completamente.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El fichero %1 no puede guardarse debido a un conflicto con el nombre de otro fichero local!</translation> </message> @@ -1412,17 +1449,17 @@ No se recomienda usarla.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Falló la restauración:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Continúe agregando a su lista negra:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Un archivo o directorio fue eliminado de una carpeta compartida en modo de solo lectura, pero la recuperación falló: %1</translation> </message> @@ -1430,12 +1467,12 @@ No se recomienda usarla.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Atención, posible error de mayúsculas/minúsculas en %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>No se pudo crear el directorio %1</translation> </message> @@ -1443,17 +1480,17 @@ No se recomienda usarla.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Error al eliminar '%1': %2; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>No se pudo eliminar el directorio '%1'; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>No se pudo eliminar %1 por causa de un conflicto con el nombre de un archivo local</translation> </message> @@ -1461,7 +1498,7 @@ No se recomienda usarla.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>El archivo %1 no se puede renombrar a %2 por causa de un conflicto con el nombre de un archivo local</translation> </message> @@ -1469,45 +1506,45 @@ No se recomienda usarla.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>El archvo fue eliminado de una carpeta compartida en modo de solo lectura. Ha sido recuperado.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>El código HTTP devuelto por el servidor es erróneo. Esperado 204, pero recibido "%1 %2".</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>El código HTTP devuelto por el servidor es erróneo. Esperado 201, pero recibido "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Esta carpeta no debe ser renombrada. Ha sido renombrada a su nombre original</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Esta carpeta no debe ser renombrada. Favor de renombrar a Compartida.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>El archivo fue renombrado, pero es parte de una carpeta compartida en modo de solo lectura. El archivo original ha sido recuperado.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>El código HTTP devuelto por el servidor es erróneo. Esperado 201, pero recibido "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1532,33 +1569,33 @@ No se recomienda usarla.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Archivo eliminado</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Un archivo local fue modificado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>El archivo fue modificado localmente; pero es parte de una carpeta compartida en modo de sólo lectura. Ha sido recuperado y su modificación está en el archivo de conflicto.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>URL de encuesta faltante</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>El archivo local fue eliminado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>El servidor no reconoció la última parte. (No había una e-tag presente.)</translation> </message> @@ -1576,16 +1613,6 @@ No se recomienda usarla.</translation> <translation>Actividad de la sincronización</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Hora</translation> @@ -1626,29 +1653,29 @@ No se recomienda usarla.</translation> <translation>Copie la lista de actividades al portapapeles</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Copiado al portapapeles</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>El informe de sincronización fue copiado al portapapeles.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>Actualmente no hay archivos ignorados debido a errores previos y a que no hay descargas en progreso.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>%n Archivos han sido ignorados debido a errores previos. </numerusform><numerusform>%n Archivos han sido ignorados debido a errores previos. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>€n archivos han sido parcialmente descargados. @@ -1656,7 +1683,7 @@ No se recomienda usarla.</translation> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Intentar sincronizar de nuevo</translation> </message> @@ -1664,22 +1691,22 @@ No se recomienda usarla.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Las carpetas no seleccionadas serán <b>eliminadas</b> de su sistema de archivos local y ya no serán sincronizadas con esta computadora</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Elija qué sincronizar: seleccione las subcarpetas remotas que desea sincronizar.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Elija qué sincronizar: desmarque las subcarpetas remotas que no desea sincronizar.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Escoja qué sincronizar</translation> </message> @@ -1687,20 +1714,31 @@ No se recomienda usarla.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Cargando...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Nombre</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Tamaño</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1710,22 +1748,22 @@ No se recomienda usarla.</translation> <translation>Ajustes</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Actividad</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>General</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Red</translation> </message> @@ -1733,27 +1771,27 @@ No se recomienda usarla.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Actividad</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>General</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Red</translation> </message> @@ -1766,104 +1804,139 @@ No se recomienda usarla.</translation> <translation>Compartir nuevo documento.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Compartir información</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>Texto Etiqueta</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>Compartido por</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>Ruta de OwnCloud:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Compartir link</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Establecer contraseña</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Establecer fecha de expiración</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Establecer contraseña</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1 ruta: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>%1 Compartiendo</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Contraseña protegida</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Elija una contraseña para el enlace publico</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>OCS API codigo error: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>No hay ninguna carpeta de sincronización configurada.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>No puede hallarse una carpeta a la cual subir.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>La compartición de directorios externos no está funcionando aún.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Existe un archivo sincronizado con el mismo nombre. Éste no se puede registrar para sincronizar.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>La compartición de directorios externos no está funcionando aún.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Esperando para subir...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>No se pudo registrar el espacio de sincronización.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>The archivo no será sincronizado.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>La sincronización de los archivos registrados aún no ha sido exitosa.</translation> </message> @@ -1884,30 +1957,25 @@ No se recomienda usarla.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Autenticar</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Debe volver a autenticarse</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Su sesión ha caducado. Necesita volver a iniciarla para continuar usando el cliente.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Compartir con %1</translation> @@ -1916,114 +1984,114 @@ No se recomienda usarla.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Detalles del certificado</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Nombre común (NC):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Nombres alternativos del sujeto:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organización (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Unidad organizacional (UO):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Estado/provincia:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>País:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Nº serie:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Emisor</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Emisor:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Emitido en:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Expira en:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Firma</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Notificación:</b> Este certificado fue aprobado manualmente</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (autofirmado)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Esta conexión está cifrada con %1 bit %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Información del certificado:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Esta conexión NO ES SEGURA, pues no está cifrada. @@ -2044,67 +2112,67 @@ No se recomienda usarla.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>Conexión SSL</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Avisos sobre la conexión SSL actual:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>con certificado %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;no especificado&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organización: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Unidad: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Huella (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Huella dactilar (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Fecha de vigencia: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Fecha de caducidad: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Emisor: %1</translation> </message> @@ -2112,219 +2180,229 @@ No se recomienda usarla.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Completado con éxito.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync falló al cargar o crear el archivo de diario. Asegúrese de tener permisos de lectura y escritura en el directorio local de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>CSync fallo al cargar el archivo de diaro. El darchivo de diario se encuentra corrupto.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>El %1 complemento para csync no se ha podido cargar.<br/>Por favor, verifique la instalación</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync encontró un error mientras procesaba los árboles de datos internos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>Hubo un fallo al reservar memoria para Csync</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>Error fatal de parámetro en CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>El proceso de actualización de CSync ha fallado.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>Falló el proceso de composición de CSync</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync no pudo autenticar el proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync falló al realizar la búsqueda del proxy</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync: Falló la autenticación con el servidor %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync: Falló la conexión con la red.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Se sobrepasó el tiempo de espera de la conexión de red.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Ha ocurrido un error de transmisión HTTP.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync: Falló debido a un permiso denegado.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>Error al acceder CSync</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync trató de crear un directorio que ya existe.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: No queda espacio disponible en el servidor %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>Error no especificado de CSync</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Interrumpido por el usuario</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>Temporalmente, el directorio en uso no se encuentra disponible en el servidor</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Ha ocurrido un error al abrir el directorio</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Ha ocurrido un error interno número %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>El elemento no está sincronizado por errores previos: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>No se admiten enlaces simbólicos en la sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Los enlaces duros no están permitidos en la sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>El fichero está en la lista de ignorados</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>El fichero contiene caracteres inválidos que no pueden ser sincronizados con la plataforma.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Los caracteres del nombre de fichero no son válidos</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>No se pudo inicializar un registro (journal) de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>No es posible abrir el diario de sincronización</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado por que se encuentra en la lista negra de "elija qué va a sincronizar"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>No está permitido porque no tiene permisos para añadir subcarpetas en este directorio.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>No está permitido porque no tiene permisos para añadir un directorio</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>No está permitido porque no tiene permisos para crear archivos en este directorio</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>No está permitido borrar, restaurando.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Se eliminaron los archivos locales y la carpeta compartida.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>No está permitido mover, elemento restaurado.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>No está permitido mover, porque %1 es de sólo lectura.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>destino</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>origen</translation> </message> @@ -2332,7 +2410,7 @@ No se recomienda usarla.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2340,17 +2418,17 @@ No se recomienda usarla.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>La versión %1. Para obtener más información, visite<a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Copyright ownCloud, incorporado</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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>Distribuido por %1 y con licencia GNU General Public License (GPL) Version 2.0.<br/>%2 y el lo de %2 son marcas registradas de %1 en los Estados Unidos y otros países, o ambos.</p></translation> </message> @@ -2455,7 +2533,8 @@ No se recomienda usarla.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Se ha producido un fallo</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2501,7 +2580,7 @@ No se recomienda usarla.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Versión %2. Para más información, visite <a href="%3">%4</a></p><p><small>Creado por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz y otros.</small></p><p>Copyright ownCloud, Inc.</p><p>Licenciado bajo la Licencia General Pública (GPL, en inglés) GNU Versión 2.0<br/>ownCloud y el logo de ownCloud son marcas registradas de ownCloud, Inc. en los Estados Unidos, otros países, o ambos.</p></translation> </message> @@ -2598,7 +2677,7 @@ No se recomienda usarla.</translation> <translation>Configurar certificado TLS del Cliente</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>Fallo al conectar con la dirección del servidor seguro <em>%1</em>. ¿Cómo desea proceder</p></body></html></translation> </message> @@ -2775,12 +2854,12 @@ No se recomienda usarla.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>La bandeja del sistema no está disponible</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>% 1 requiere una bandeja del sistema de trabajo. Si está ejecutando XFCE, por favor siga <a href="http://docs.xfce.org/xfce/xfce4-panel/systray"> estas instrucciones </ a>. De lo contrario, instale una aplicación de la bandeja del sistema, tales como 'trayer' y vuelva a intentarlo.</translation> </message> @@ -2788,82 +2867,87 @@ No se recomienda usarla.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Construido desde la revisión Git <a href="%1">%2</a> el %3, %4 usando Qt %5.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Descargado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Subido</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Eliminado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Movido a %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Ignorado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Error de acceso al sistema de archivos</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Desconocido</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>descargando</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>subiendo</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>eliminando</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>moviendo</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>ignorando</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>error</translation> </message> @@ -2871,52 +2955,52 @@ No se recomienda usarla.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Estado indefinido</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Esperando para comenzar la sincronización</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Sincronización ejecutándose</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Sincronización exitosa</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation>Sincronización exitosa, algunos archivos fueron ignorados.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Error al sincronizar</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Error de instalación</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Preparando para sincronizar</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Interrumpiendo...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>La sincronización se ha pausado</translation> </message> diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index 6e94d75a4..daed7bac2 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -30,27 +30,27 @@ <translation>Formulario</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Recargar</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Directorios</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>Texto de la etiqueta</translation> </message> @@ -134,96 +134,96 @@ <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Confirmá la eliminación del directorio</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>¿Realmente deseas detener la sincronización de la carpeta <i>%1</i>?</p><p><b>Nota:</b>Estp no removerá los archivos desde tu cliente.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Confirme el reseteo de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>¿Realmente deseas resetear el directorio <i>%1</i> y reconstruir la base de datos del cliente?</p><p><b>Nota:</b> Esta función está designada para propósitos de mantenimiento solamente. Ningún archivo será eliminado, pero puede causar un tráfico de datos significante y tomar varios minutos o horas para completarse, dependiendo del tamaño del directorio. Sólo use esta opción si es aconsejado por su administrador.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La sincronización está en curso.<br/>¿Querés interrumpirla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Conectado a <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>No hay ninguna conexión de %1 configurada.</translation> </message> @@ -256,12 +256,12 @@ Total time left %5</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation type="unfinished"/> </message> @@ -292,33 +292,38 @@ Total time left %5</source> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>No hay una cuenta ownCloud configurada.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>La configuración del servidor al cliente es obsoleta</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Por favor actualice a la última versión del servidor y reinicie el cliente.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Imposible conectar a %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Las credenciales otorgadas no son correctas</translation> </message> @@ -326,30 +331,38 @@ Total time left %5</source> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Imposible crear csync-context</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>El directorio local %1 no existe.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 debería ser un directorio, pero no lo es.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>No se puede leer %1.</translation> </message> @@ -463,62 +476,62 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>No se pudo </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Estado no definido.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Esperando el comienzo de la sincronización.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Preparando la sincronización.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Sincronización en funcionamiento.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>La última sincronización fue exitosa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>El último Sync fue exitoso, pero hubo advertencias en archivos individuales.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Error de configuración.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Interrumpir.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>La sincronización está en pausa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sincronización en pausa)</translation> </message> @@ -545,8 +558,8 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>gregar directorio</translation> </message> @@ -554,67 +567,67 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Clic para seleccionar un directorio local a sincornizar</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Ingrese el path al directorio local.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>El alias de directorio es un nombre descriptivo para esta conexión de sincronización</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>¡No se ha seleccionado un directorio local válido!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>¡No tenés permisos para escribir el directorio seleccionado!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>El path local %1 ya es un directorio actualizado. ¡Por favor seleccione otro!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Hay un directorio sincronizado en de la selección actual.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Un directorio configurado ya está contenido en el ingresado.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>El directorio seleccionado es un vínculo simbólico. Un directorio ya configurado es el padre del actual y es contenido por el directorio que este vínculo apunta.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>El campo "alias" no puede quedar vacío. Por favor, escribí un texto descriptivo.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>El alias <i>%1</i> ya está en uso. Por favor, seleccione otro.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Seleccioná el directorio origen</translation> </message> @@ -622,42 +635,47 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>El directorio fue creado con éxito en %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Fallo al crear el directorio en %1. Por favor chequee manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Seleccioná acá para sincronizar la cuenta completa</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Este folder ya está siendo sincronizado.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Ya estás sincronizando <i>%1</i>, el cual es el directorio de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation type="unfinished"/> </message> @@ -665,7 +683,7 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> @@ -673,31 +691,35 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Advertencia:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation type="unfinished"/> </message> @@ -754,12 +776,12 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Ingresar contraseña</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Por favor, ingresa %1 contraseña para el usuario '%2':</translation> </message> @@ -835,8 +857,8 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Buscar:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -875,19 +897,19 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>No fue posible escribir al archivo de log</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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>El archivo '%1'<br/>no puede ser abierto para escritura.<br/><br/>¡El archivo de log <b>no</b> puede ser guardado!</nobr></translation> </message> @@ -895,7 +917,7 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> @@ -903,27 +925,27 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Nueva versión disponible</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Saltear esta vez</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Obtener actualización</translation> </message> @@ -1032,53 +1054,53 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation type="unfinished"/> </message> @@ -1106,28 +1128,33 @@ for additional privileges during the process.</source> <translation>El directorio %1 '%2' está sincronizado con el directorio local '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Advertencia:</strong>Actualmente tenés múltiples directorios configurados. ¡Si seguís con la configuración actual, el directorio de configuración será descartado y se creará un único directorio raíz!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Advertencia:</strong>El directorio local no está vacío. ¡Seleccioná otro!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Directorio local de sincronización</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Actualizar configuración avanzada</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation type="unfinished"/> </message> @@ -1145,7 +1172,7 @@ for additional privileges during the process.</source> <translation>Ingresá las credenciales de usuario</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Actualizar credenciales</translation> </message> @@ -1187,129 +1214,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Conectado a %1: versión de %2 %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Falló al conectarse a %1 en %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Intentando conectar a %1 en %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>El directorio de sincronización local %1 ya existe, configurándolo para la sincronización.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> - <source>Creating local sync folder %1... </source> - <translation>Creando el directorio %1...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>aceptar</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>Error.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>No fue posible crear el directorio local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>¡No se ha especificado un directorio remoto!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>Creando carpeta en ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>El directorio remoto %1 fue creado con éxito.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>El directorio remoto %1 ya existe. Estableciendo conexión para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación del directorio resultó en un error HTTP con código de error %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Error al crear el directorio remoto porque las credenciales provistas son incorrectas.</font><br/>Por favor, volvé atrás y verificá tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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">Error al crear el directorio remoto, probablemente porque las credenciales provistas son incorrectas.</font><br/>Por favor, volvé atrás y verificá tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Se prtodujo un error <tt>%2</tt> al crear el directorio remoto %1.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Fue creada una conexión de sincronización desde %1 al directorio remoto %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Conectado con éxito a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No fue posible establecer la conexión a %1. Por favor, intentalo nuevamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Error Al Renombrar Directorio</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Directorio local %1 creado</b></font></translation> </message> @@ -1348,7 +1385,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation type="unfinished"/> </message> @@ -1356,7 +1393,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"/> </message> @@ -1392,17 +1429,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -1410,17 +1447,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -1428,12 +1465,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1441,17 +1478,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1459,7 +1496,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1467,44 +1504,44 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> @@ -1530,33 +1567,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation type="unfinished"/> </message> @@ -1574,16 +1611,6 @@ It is not advisable to use it.</source> <translation>Actividad de Sync</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Hora</translation> @@ -1624,34 +1651,34 @@ It is not advisable to use it.</source> <translation>Copiar la lista de actividades al portapapeles.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Copiado al portapapeles</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>El estado de sincronización ha sido copiado al portapapeles</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation type="unfinished"/> </message> @@ -1659,22 +1686,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation type="unfinished"/> </message> @@ -1682,20 +1709,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Cargando...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Nombre</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Tamaño</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1705,22 +1743,22 @@ It is not advisable to use it.</source> <translation>Configuración</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Actividad</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>General</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Red</translation> </message> @@ -1728,27 +1766,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Actividad</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>General</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Red</translation> </message> @@ -1761,104 +1799,139 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Compartir vínculo</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> - <source>Waiting to upload...</source> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> - <source>Unable to register in sync space.</source> + <location filename="../src/gui/sharedialog.cpp" line="608"/> + <source>Waiting to upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> + <location filename="../src/gui/sharedialog.cpp" line="610"/> + <source>Unable to register in sync space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"/> </message> @@ -1879,30 +1952,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Autenticarse</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"/> @@ -1911,113 +1979,113 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Pais:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation type="unfinished"/> @@ -2037,67 +2105,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>Conexión SSL</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Avisos de tu conexión actual SSL:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>con certificado %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;no especificado&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Empresa: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Unidad: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Huella (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Huella (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Desde: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Generado por: %1</translation> </message> @@ -2105,219 +2173,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Éxito.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>No fue posible cargar el plugin de %1 para csync.<br/>Por favor, verificá la instalación</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync tuvo un error mientras procesaba los árboles de datos internos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync falló al reservar memoria.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>Error fatal de parámetro en CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>Falló el proceso de actualización de CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>Falló el proceso de composición de CSync</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync no pudo autenticar el proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync falló al realizar la busqueda del proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync: fallo al autenticarse en el servidor %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync: fallo al conectarse a la red</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Ha ocurrido un error de transmisión HTTP.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync: Falló debido a un permiso denegado.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync falló al acceder</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>Csync trató de crear un directorio que ya existía.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: No hay más espacio disponible en el servidor %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>Error no especificado de CSync</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Interrumpido por el usuario</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Los vínculos simbólicos no está soportados al sincronizar.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>El archivo está en la lista de ignorados.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>El archivo contiene caracteres inválidos que no pueden ser sincronizados entre plataforma.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Imposible inicializar un diario de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation type="unfinished"/> </message> @@ -2325,7 +2403,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2333,17 +2411,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 type="unfinished"/> </message> @@ -2448,6 +2526,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"/> </message> <message> @@ -2494,7 +2573,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"/> </message> @@ -2591,7 +2670,7 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"/> </message> @@ -2769,12 +2848,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>La bandeja del sistema no está disponible</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>% 1 requiere una bandeja del sistema funcionando. Si estás usando XFCE, por favor leé <a href="http://docs.xfce.org/xfce/xfce4-panel/systray"> estas instrucciones</ a>. De lo contrario, instalá una aplicación de la bandeja del sistema, como 'trayer' e intentalo de nuevo.</translation> </message> @@ -2782,82 +2861,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Descargado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Subido</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Borrado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Movido a %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Desconocido</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>descargando</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>subiendo</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>error</translation> </message> @@ -2865,52 +2949,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Estado indefinido</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Esperando para comenzar sincronización</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Sincronización en ejecución</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Sincronización Exitosa</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation>Syncronización exitosa, algunos archivos fueron ignorados.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Error de Sync</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Error de instalación</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Preparando para la sincronizacipon</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Abortando...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Sincronización Pausada</translation> </message> diff --git a/translations/client_et.ts b/translations/client_et.ts index 2a127b6a3..d89ccba20 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -30,27 +30,27 @@ <translation>Vorm</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Vali eemalolev sihtkaust</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Värskenda</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Kaustad</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>TekstiSilt</translation> </message> @@ -134,97 +134,97 @@ <translation>Taasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Kinnita kausta eemaldamist</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Kas tõesti soovid peatada kataloogi <i>%1</i> sünkroniseerimist?.</p><p><b>Märkus:</b> See ei eemalda faile sinu kliendist.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Kinnita kataloogi algseadistus</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Kas tõesti soovid kataloogi <i>%1</i> algseadistada ning uuesti luua oma kliendi andmebaasi?</p><p><b>See funktsioon on mõeldud peamiselt ainult hooldustöödeks. Märkus:</b>Kuigi ühtegi faili ei eemaldata, siis see võib põhjustada märkimisväärset andmeliiklust ja võtta mitu minutit või tundi, sõltuvalt kataloogi suurusest. Kasuta seda võimalust ainult siis kui seda soovitab süsteemihaldur.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Sünkroniseerimine on käimas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>'%1' avastamine</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 of %4) %5 jäänud kiirusel %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 of %2, fail %3 of %4 Aega kokku jäänud %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>fail %1 / %2-st</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) %2-st serveri mahust on kasutuses.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Hetkel pole mahu kasutuse info saadaval.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Ühendatud <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Ühendatud <a href="%1">%2</a> kui <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Ühendus puudub %1 <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Ühtegi %1 ühendust pole seadistatud.</translation> </message> @@ -257,12 +257,12 @@ Aega kokku jäänud %5</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation type="unfinished"/> </message> @@ -293,33 +293,38 @@ Aega kokku jäänud %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Ühtegi ownCloud kontot pole seadistatud</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Seadistatud server on selle kliendi jaoks liiga vana</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Palun uuenda server viimasele versioonile ning taaskäivita klient.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>%1-ga ühendumine ebaõnnestus</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>aegumine</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Sisestatud kasutajatunnused pole õiged</translation> </message> @@ -327,30 +332,38 @@ Aega kokku jäänud %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Ei suuda luua csync-konteksti</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Kohalikku kausta %1 pole olemas.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 peaks olema kataloog, kuid pole seda mitte.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 pole loetav.</translation> </message> @@ -464,62 +477,62 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Ei suutnud tühistada kataloogi staatust</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Määramata staatus.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Ootab sünkroniseerimise alustamist.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Valmistun sünkroniseerima.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Sünkroniseerimine on käimas.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Viimane sünkroniseerimine oli edukas.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Seadistamise viga.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Kasutaja tühistamine.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Sünkroniseerimine on peatatud.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sünkroniseerimine on peatatud)</translation> </message> @@ -546,8 +559,8 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Lisa kaust</translation> </message> @@ -555,67 +568,67 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Klõpsa valimaks kohalikku sünkroniseeritavat kataloogi.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Sisesta otsingutee kohaliku kataloogini.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>Kataloogi alias on kirjeldav nimi selle sünkroniseeringu ühenduse jaoks.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Ühtegi toimivat kohalikku kausta pole valitud!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Sul puuduvad õigused valitud kataloogi kirjutamiseks!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Kohalik kataloog %1 juba on üleslaaditav kataloog. Palun vali mõni teine!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Antud kataloogis juba sidaldub eelnevalt seadistatud kataloog.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Valitud kataloog on sümboolne link. Juba eelnevalt seadistatud kataloog sisaldub kataloogis, millele antud link viitab.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Eelnevalt seadistatud kataloog juba sisaldab praegu sisestatud kataloogi.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Valitud kataloog on sümboolne link. Juba eelnevalt seadistatud kataloog on praegu valitud kataloogi ülemkataloog, sisaldades kataloogi, millele antud link viitab.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Alias ei saa olla tühi. Palun sisesta kirjeldav sõna.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>Alias <i>%1</i> on juba kasutuses. Palun vali mõni teine alias.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Vali algne kaust</translation> </message> @@ -623,42 +636,47 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>%1 - kaust on loodud.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Kausta loomine ebaõnnestus - %1. Palun kontrolli käsitsi.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Vali see sünkroniseering tervele kontole</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Seda kataloogi juba sünkroniseeritakse.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Sa juba sünkroniseerid <i>%1</i>, mis on <i>%2</i> ülemkataloog.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Sa juba sünkroniseerid kõiki oma faile. Teise kataloogi sünkroniseering <b>ei ole</b> toetatud. Kui soovid sünkroniseerida mitut kataloogi, palun eemalda hektel seadistatud sünkroniseeritav juurkataloog.</translation> </message> @@ -666,7 +684,7 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> @@ -674,31 +692,35 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Hoiatus:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Server tagastas vale vahemiku</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Ühenduse aegumine</translation> </message> @@ -755,12 +777,12 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Sisesta parool</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Palun sisesta %1 parool kasutajale '%2':</translation> </message> @@ -836,8 +858,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>Ot&si:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Logifaili kirjutamine ebaõnnestus</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Viga</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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>Faili '%1'<br/>ei saa kirjutamiseks avada.<br/><br/>Logi väljundit <b>ei saa</b> salvestada!</nobr></translation> </message> @@ -896,7 +918,7 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> @@ -904,27 +926,27 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Saadaval on uuem versioon</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Uus versioon %1 kliendist on saadaval.</p><p><b>%2</b> on saadaval alla laadimiseks. Paigaldatud on versioon %3.<p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Jäta see versioon vahele</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Jäta seekord vahele</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Hangi uuendus</translation> </message> @@ -1033,54 +1055,53 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Uundus on valmis</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Uuendust hakatakse paigaldama. Uuendus võib küsida -täiendavaid õigusi protsessi käigus.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Laadin alla versiooni %1. Palun oota...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Versioon %1 on saadaval. Taaskäivita rakendus alustamaks uuendust.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Ei suutnud uuendust alla laadida. Palun klõpsa käsitsi uuenduse alla laadimiseks <a href='%1'>siia</a> %2</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Uuenduste kontrollimine ebaõnnestus.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Uus versioon %1 on saadaval. Palun kasuta süsteemi uuendushaldurit selle paigaldamiseks.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Kontrollin uuendusserverit...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Uuenduse staatus on teadmata: Uuendusi ei kontrollitud.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Uuendusi pole saadaval. Kasutad kõige viimast versiooni.</translation> </message> @@ -1108,28 +1129,33 @@ täiendavaid õigusi protsessi käigus.</translation> <translation>%1 kataloog '%2' on sünkroniseeritud kohalikku kataloogi '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Hoiatus:</strong>Sul on seadistatud mitu kataloogi. Kui sa jätkad olemasoleva seadistusega, siis kataloogide seadistus hüljatakse ning selle asemel luuakse üks peakataloogi sünkroniseering!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Hoiatus:</strong> Kohalik kataloog ei ole tühi. Vali lahendus!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Kohalik Sync Kataloog</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Uuenda täpsemat seadistust</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation type="unfinished"/> </message> @@ -1147,7 +1173,7 @@ täiendavaid õigusi protsessi käigus.</translation> <translation>Sisesta kasutajaandmed</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Uuenda kasutajaandmeid</translation> </message> @@ -1190,129 +1216,139 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Edukalt ühendatud %1: %2 versioon %3 (4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Ühendumine ebaõnnestus %1 %2-st:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Püüan ühenduda %1 kohast %2</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Kohalik kataloog %1 on juba olemas. Valmistan selle ette sünkroniseerimiseks.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> - <source>Creating local sync folder %1... </source> - <translation>Kohaliku kausta %1 sünkroonimise loomine ... </translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>ebaõnnestus.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>Ei suuda tekitada kohalikku kataloogi %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Ühtegi võrgukataloogi pole määratletud!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Viga: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>loon uue kataloogi ownCloudi: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Eemalolev kaust %1 on loodud.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Serveris on kataloog %1 juba olemas. Ühendan selle sünkroniseerimiseks.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Kausta tekitamine lõppes HTTP veakoodiga %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Kataloogi loomine serverisse ebaõnnestus, kuna kasutajatõendid on valed!<br/>Palun kontrolli oma kasutajatunnust ja parooli.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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">Serveris oleva kataloogi tekitamine ebaõnnestus tõenäoliselt valede kasutajatunnuste tõttu.</font><br/>Palun mine tagasi ning kontrolli kasutajatunnust ning parooli.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Kataloogi %1 tekitamine serverisse ebaõnnestus veaga <tt>%2</tt></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Loodi sünkroniseerimisühendus kataloogist %1 serveri kataloogi %2</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Edukalt ühendatud %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Ühenduse loomine %1 ebaõnnestus. Palun kontrolli uuesti.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Kataloogi ümbernimetamine ebaõnnestus</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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>Ei suuda eemaldada ning varundada kataloogi kuna kataloog või selles asuv fail on avatud mõne teise programmi poolt. Palun sulge kataloog või fail ning proovi uuesti või katkesta paigaldus.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Kohalik kataloog %1 edukalt loodud!</b></font></translation> </message> @@ -1351,7 +1387,7 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Ühenduse aegumine</translation> </message> @@ -1359,7 +1395,7 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"/> </message> @@ -1395,17 +1431,17 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Faili %1 ei saa alla laadida kuna on konflikt kohaliku faili nimega.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga!</translation> </message> @@ -1413,17 +1449,17 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Taastamine ebaõnnestus: </translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Fail või kataloog oli eemaldatud kirjutamisõiguseta jagamisest, kuid taastamine ebaõnnestus: %1</translation> </message> @@ -1431,12 +1467,12 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Tähelepanu, võimalik tõusutundliku nime konflikt %1-ga</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>ei suuda luua kataloogi %1</translation> </message> @@ -1444,17 +1480,17 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Eemaldamise viga '%1': %2; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Ei suutnud eemaldada kataloogi '%1';</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Ei saa eemaldada %1 kuna on konflikt kohaliku faili nimega</translation> </message> @@ -1462,7 +1498,7 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Faili %1 ei saa ümber nimetada %2-ks, kuna on konflikt kohaliku faili nimega</translation> </message> @@ -1470,44 +1506,44 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Fail oli eemaldatud kirjutamisõiguseta kataloogist. See on nüüd taastatud.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Kausta ei tohi ümber nimetada. Kausta algne nimi taastati.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Kausta nime ei tohi muuta. Palun pane selle nimeks tagasi Shared.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Fail oli ümber nimetatud, kuid see on osa kirjutamisõiguseta jagamisest. Algne fail taastati.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> @@ -1533,33 +1569,33 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Kohalik fail muutus sünkroniseeringu käigus.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Faili on lokaalselt muudetud, kuid see on osa kirjutamisõiguseta jagamisest. See on taastatud ning sinu muudatus on konfliktses failis.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Server ei tunnistanud viimast tükki. (E-silt puudus).</translation> </message> @@ -1577,16 +1613,6 @@ Selle kasutamine pole soovitatav.</translation> <translation>Sünkroniseerimise tegevus</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Aeg</translation> @@ -1627,34 +1653,34 @@ Selle kasutamine pole soovitatav.</translation> <translation>Kopeeri tegevuste nimistu puhvrisse.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Kopeeritud lõikepuhvrisse</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Sünkroniseeringu staatus on kopeeritud lõikepuhvrisse.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>Hetkel ei ignoreerita ühtegi faili eelnenud vigade tõttu ja ühtegi allalaadimist ei toimu</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Proovi neid uuesti sünkroniseerida.</translation> </message> @@ -1662,22 +1688,22 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Märkimata kataloogid <b>eemaldatakse</b> kohalikust failisüsteemist ning neid ei sünkroniseerita enam sellesse arvutisse</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Vali, mida sünkroniseerida</translation> </message> @@ -1685,20 +1711,31 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Laadimine ...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Nimi</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Suurus</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1708,22 +1745,22 @@ Selle kasutamine pole soovitatav.</translation> <translation>Seaded</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Toimingud</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Üldine</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Võrk</translation> </message> @@ -1731,27 +1768,27 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Toimingud</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Üldine</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Võrk</translation> </message> @@ -1764,104 +1801,139 @@ Selle kasutamine pole soovitatav.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>Tekstisilt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Jaga linki</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Vali avaliku lingi jaoks parool</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> - <source>Waiting to upload...</source> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> - <source>Unable to register in sync space.</source> + <location filename="../src/gui/sharedialog.cpp" line="608"/> + <source>Waiting to upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> + <location filename="../src/gui/sharedialog.cpp" line="610"/> + <source>Unable to register in sync space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"/> </message> @@ -1882,30 +1954,25 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - autentimine</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Vajalik on uuesti autentimine</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Sinu sessioon on aegunud. Sa pead kliendi kasutamiseks uuesti sisse logima.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"/> @@ -1914,114 +1981,114 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Sertifikaadi detailid</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Üldine nimi (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Subjekti Alternatiivsed Nimed:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organisatsioon (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Organisatsiooni üksus (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Riik/Maakond:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Riik:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Järjenumber:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Väljastaja</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Väljastaja:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Väljastatud:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Aegub:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Sõrmejäljendid</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Märkus</b>See sertifikaat on käsitsi heakskiidetud</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (oma-signeering)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Ühendus on krüpteeritud kasutades %1 bitt %2 </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Seritifikaadi informatsioon:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>See url EI OLE turvaline, kuna see pole krüpteeritud. @@ -2042,67 +2109,67 @@ Selle kasutamine pole soovitatav.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL ühendus</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Hoiatused praeguse SSL ühenduse kohta:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>sertifikaadiga %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;pole määratud&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organisatsioon: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Ühik: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Riik: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Sõrmejälg (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Sõrmejälg (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Efektiivne kuupäev: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Aegumise kuupäev: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Esitaja: %1</translation> </message> @@ -2110,219 +2177,229 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Korras.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>Csync ei suutnud avada või luua registri faili. Tee kindlaks et sul on õigus lugeda ja kirjutada kohalikus sünkrooniseerimise kataloogis</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Ei suuda laadida csync lisa %1.<br/>Palun kontrolli paigaldust!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync sai vea sisemiste andmestruktuuride töötlemisel.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync ei suutnud mälu reserveerida.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>CSync parameetri saatuslik viga.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSync uuendusprotsess ebaõnnestus.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync tasakaalustuse protsess ebaõnnestus.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync ei suutnud puhverserveris autoriseerida.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>Csync ei suuda leida puhverserverit.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync autoriseering serveris %1 ebaõnnestus.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync võrguga ühendumine ebaõnnestus.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Toimus võrgukatkestus.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>HTTP ülekande viga.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync ebaõnnestus ligipääsu puudumisel.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSyncile ligipääs ebaõnnestus</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>Csync proovis tekitada kataloogi, mis oli juba olemas.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Serveris %1 on ruum otsas.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSync tuvastamatu viga.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Kasutaja poolt tühistatud</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Tekkis sisemine viga number %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Üksust ei sünkroniseeritud eelnenud vigade tõttu: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Sümboolsed lingid ei ole sünkroniseerimisel toetatud.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Jäigad lingid ei ole sünkroniseerimisel toetatud.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Fail on märgitud ignoreeritavate nimistus.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Fail sisaldab sobimatuid sümboleid, mida ei saa sünkroniseerida erinevate platvormide vahel.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Ei suuda avada sünkroniseeringu zurnaali</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"Vali, mida sünkroniseerida" musta nimekirja tõttu vahele jäetud</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Pole lubatud, kuna sul puuduvad õigused lisada sellesse kataloogi lisada alam-kataloogi</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Pole lubatud, kuna sul puuduvad õigused lisada ülemkataloog</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Pole lubatud, kuna sul puuduvad õigused sellesse kataloogi faile lisada</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Eemaldamine pole lubatud, taastan</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Kohalikud failid ja jagatud kaustad eemaldatud.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Liigutamine pole lubatud, üksus taastatud</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Liigutamien pole võimalik kuna %1 on ainult lugemiseks</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>sihtkoht</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>allikas</translation> </message> @@ -2330,7 +2407,7 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2338,17 +2415,17 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 type="unfinished"/> </message> @@ -2453,6 +2530,7 @@ Selle kasutamine pole soovitatav.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"/> </message> <message> @@ -2499,7 +2577,7 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"/> </message> @@ -2596,7 +2674,7 @@ Selle kasutamine pole soovitatav.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"/> </message> @@ -2773,12 +2851,12 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Süsteemisalv pole saadaval</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 vajab tööks süsteemisalve. Kui Sa kasutad XFCE-d, palun järgi <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">neid juhiseid</a>. Muudel juhtudel palun paigalda süsteemisalve rakendus nagu näiteks 'trayer' ning proovi uuesti.</translation> </message> @@ -2786,82 +2864,87 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Loodud Git revisjonist<a href="%1">%2</a> %3, %4 kasutades Qt %5.</small><p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Allalaetud</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Üles laetud</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Kustutatud</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Tõstetud %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Eiratud</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Failisüsteemi ligipääsu viga</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Viga</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Tundmatu</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>allalaadimine</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>üleslaadimine</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>kustutan</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>liigutan</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>eiran</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>viga</translation> </message> @@ -2869,52 +2952,52 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Staatus on määramata</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Oodatakse sünkroniseerimise alustamist</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Sünkroniseerimine on käimas</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Sünkroniseerimine on tehtud</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation>Sünkroniseering õnnestus, mõnda faili ignoreeriti.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Sünkroniseerimise viga</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Viga sünkroniseerimisel</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Sünkroniseerimiseks valmistumine</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Tühistamine ...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Sünkroniseerimine on peatatud</translation> </message> diff --git a/translations/client_eu.ts b/translations/client_eu.ts index ad3943276..e40f66b96 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -30,27 +30,27 @@ <translation>Formularioa</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Hautatu hurruneko helburu karpeta</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Sortu Karpeta</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Birkargatu</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Karpetak</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>TestuEtiketa</translation> </message> @@ -134,97 +134,97 @@ <translation>Berrekin</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Baieztatu karpetaren ezabatzea</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Bentan nahi duzu karpetaren sinkronizazioa gelditu? <i>%1</i>?</p><p><b>Oharra:</b>Honek ez du fitxategiak zure bezerotik ezabatuko.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Baieztatu Karpetaren Leheneratzea</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Benetan nahi duzu <i>%1</i> karpeta leheneratu eta zure bezeroaren datu basea berreraiki?</p><p><b>Oharra:</p> Funtzio hau mantenurako bakarrik diseinauta izan da. Ez da fitxategirik ezabatuko, baina honek datu trafiko handia sor dezake eta minutu edo ordu batzuk behar izango ditu burutzeko, karpetaren tamainaren arabera. Erabili aukera hau bakarrik zure kudeatzaileak esanez gero.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Sinkronizazioa martxan da</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Sinkronizazio martxan da.<br/>Bukatu nahi al duzu?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%4 - %3tik)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation> %2-tik %1, %4-tik %3 fitxategi Geratzen den denbora %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>%1. fitxategia %2tik</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) tik %2 zerbitzariko lekua erabilia</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation><a href="%1">%2</a>ra konektatuta.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation> <a href="%1">%2</a>ra konektatuta <i>%3</i> erabiltzailearekin.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Ez dago %1-ra konexiorik hemendik <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Ez dago %1 konexiorik konfiguratuta.</translation> </message> @@ -257,12 +257,12 @@ Geratzen den denbora %5</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation type="unfinished"/> </message> @@ -293,33 +293,38 @@ Geratzen den denbora %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Ez dago ownCloud konturik konfiguratuta</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Bezero honentzako konfiguratutako zerbitzaria oso zaharra da</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Mesedez eguneratu zerbitzarira eta berrabiarazi bezeroa.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Ezin izan da %1ra konektatu</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>denbora iraungi da</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Emandako kredentzialak ez dira zuzenak</translation> </message> @@ -327,30 +332,38 @@ Geratzen den denbora %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Ezin da csync-context sortu</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Bertako %1 karpeta ez da existitzen.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 karpeta bat izan behar zen baina ez da.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 ezin da irakurri.</translation> </message> @@ -464,62 +477,62 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Ezin izan da karpetaren egoera berrezarri</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>Aurkitu da '%1' sinkronizazio erregistro zaharra, baina ezin da ezabatu. Ziurtatu aplikaziorik ez dela erabiltzen ari.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Definitu gabeko egoera.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Itxoiten sinkronizazioa hasteko.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Sinkronizazioa prestatzen.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Sinkronizazioa martxan da.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Azkeneko sinkronizazioa ongi burutu zen.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Konfigurazio errorea.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Erabiltzaileak bertan behera utzi.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Sinkronizazioa pausatuta dago.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sinkronizazioa pausatuta dago)</translation> </message> @@ -546,8 +559,8 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Gehitu Karpeta</translation> </message> @@ -555,67 +568,67 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Klikatu sinkronizatzeko bertako karpeta bat sinkronizatzeko.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Sartu bertako karpeta berriaren bidea:</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>Direktorioaren ezizena sinkronizazio konexioaren izen deskriptiboa da.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Ez da bertako karpeta egokirik hautatu!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Ez daukazu hautatutako karpetan idazteko baimenik!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>%1 sarbidean badago kargatzeko karpeta bat. Hautatu beste bat!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Karpeta honek dagoeneko konfiguratuta dagoen beste karpeta bat du barnean</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Hautatutako karpeta esteka sinboliko bat da. Eta konfituratutako karpeta dagoeneko badago esteka apuntatzen duen karpetan.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Karpeta batek dagoeneko barnean du orain sartutako karpeta.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Hautatutako karpeta esteka sinboliko bat da. Eta konfiguratutako karpeta estekak apuntatzen duen karpetaren gurasoa da. </translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Ezizena ezin da hutsa izan. Mesedez jarri hitz esanguratsu bat.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation> <i>%1</i> ezizena dagoeneko erabiltzen ari da. Hautatu beste ezizen bat.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Hautatu jatorrizko karpeta</translation> </message> @@ -623,42 +636,47 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Sortu Urruneko Karpeta</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Sartu behean sortuko den karpeta berriaren izena '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>%1-en karpeta ongi sortu da.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Huts egin du %1-(e)an karpeta sortzen. Egiaztatu eskuz.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Hautatu hau kontu osoa sinkronizatzeko</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Karpeta hau dagoeneko sinkronizatzen ari da.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Dagoeneko <i>%1</i> sinkronizatzen ari zara, <i>%2</i>-ren guraso karpeta dena.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Dagoeneko fitxategi guztiak sinkronizatzen ari zara. <b>Ezin<b> da sinkronizatu beste karpeta bat. Hainbat karpeta batera sinkronizatu nahi baduzu ezaba ezazu orain konfiguratuta duzun sinkronizazio karpeta nagusia.</translation> </message> @@ -666,7 +684,7 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Hautatu zer nahi duzun sinkronizatzea: Sinkronizatu nahi ez dituzun urruneko azpikarpetak desmarkatu ditzazkezu.</translation> </message> @@ -674,31 +692,35 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Abisua:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Ez da E-Tagik jaso zerbitzaritik, egiaztatu Proxy/Gateway</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Jarraitzeko E-Tag ezberdina jaso dugu. Hurrengoan saiatuko gara berriz.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Konexioa denboraz kanpo</translation> </message> @@ -755,12 +777,12 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Sartu Pasahitza</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Mesedez sartu %1 pasahitza '%2' erabiltzailerako:</translation> </message> @@ -836,8 +858,8 @@ Markatutakoak ezabatuko dira karpeta bat ezabatzeko beharrezkoa bada. Hau meta d </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Bilatu:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Markatutakoak ezabatuko dira karpeta bat ezabatzeko beharrezkoa bada. Hau meta d </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Ezin da egunkari fitxategia idatzi</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Errorea</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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' Fitxategia<br/> ezin da idazteko ireki.<br/><br/>Egunkariaren irteera <b>ezin</b> da gorde!</nobr></translation> </message> @@ -896,7 +918,7 @@ Markatutakoak ezabatuko dira karpeta bat ezabatzeko beharrezkoa bada. Hau meta d <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> @@ -904,27 +926,27 @@ Markatutakoak ezabatuko dira karpeta bat ezabatzeko beharrezkoa bada. Hau meta d <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Bertsio berria eskuragarri</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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 bezeroaren bertsio berri bat eskuragarri dago.</p><p><b>%2</b>deskargatzeko prest dago. Instalatuta dagoen bersioa %3 da.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Ez eguneratu bertsio hau</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Utzi aldi honetan</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Eskuratu eguneraketa</translation> </message> @@ -1033,54 +1055,53 @@ Markatutakoak ezabatuko dira karpeta bat ezabatzeko beharrezkoa bada. Hau meta d <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Eguneraketa Berria Prest</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Eguneraketa bat instalatzeko prest dago. Eguneratzaileak - pribilegio osagarriak eskatzen ahal dizkizu.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>%1 Bertsioa deskargatzen. Mesedez itxoin...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>%1 Bertsioa eskuragarri. Abiarazi aplikazioa eguneraketa hasteko.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Ezin da eguneraketarik bilatu.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>%1 bertsio berria eskuragarri dago. Utziozu sistemaren eguneratzaileari instalatzen.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Eguneraketa zerbitzaria galdetzen...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Ez dago eguneraketarik eskuragarri. Zure instalazioa azkenengo bertsioa da.</translation> </message> @@ -1108,28 +1129,33 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Sinkronizazio karpeta lokala</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Eguneratu ezarpen aurreratuak</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1147,7 +1173,7 @@ for additional privileges during the process.</source> <translation>Sartu erabiltzailearen kredentzialak</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Eguneratu erabiltzailearen kredentzialak</translation> </message> @@ -1190,129 +1216,139 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Konexioa ongi burutu da %1 zerbitzarian: %2 bertsioa %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>%2 zerbitzarian dagoen %1 konektatzen...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Bertako %1 karpeta dagoeneko existitzen da, sinkronizaziorako prestatzen.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> - <source>Creating local sync folder %1... </source> - <translation>Bertako sinkronizazio %1 karpeta sortzen...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ados</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>huts egin du.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>Ezin da %1 karpeta lokala sortu</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Ez da urruneko karpeta zehaztu!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Errorea: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>ownClouden karpeta sortzen: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Urruneko %1 karpeta ongi sortu da.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Urruneko %1 karpeta dagoeneko existintzen da. Bertara konetatuko da sinkronizatzeko.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Karpeta sortzeak HTTP %1 errore kodea igorri du</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Huts egin du urrutiko karpeta sortzen emandako kredintzialak ez direlako zuzenak!<br/> Egin atzera eta egiaztatu zure kredentzialak.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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">Urruneko karpeten sortzeak huts egin du ziuraski emandako kredentzialak gaizki daudelako.</font><br/>Mesedez atzera joan eta egiaztatu zure kredentzialak.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Urruneko %1 karpetaren sortzeak huts egin du <tt>%2</tt> errorearekin.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Sinkronizazio konexio bat konfiguratu da %1 karpetatik urruneko %2 karpetara.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>%1-era ongi konektatu da!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>%1 konexioa ezin da ezarri. Mesedez egiaztatu berriz.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Karpetaren berrizendatzeak huts egin du</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Bertako sinkronizazio %1 karpeta ongi sortu da!</b></font></translation> </message> @@ -1351,7 +1387,7 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Konexioa denboraz kanpo</translation> </message> @@ -1359,7 +1395,7 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"/> </message> @@ -1395,17 +1431,17 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -1413,17 +1449,17 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; huth egin du berreskuratzen:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -1431,12 +1467,12 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>Ezin izan da %1 karpeta sortu</translation> </message> @@ -1444,17 +1480,17 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1462,7 +1498,7 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1470,44 +1506,44 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Karpeta hau ezin da berrizendatu. Bere jatorrizko izenera berrizendatu da.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Karpeta hau ezin da berrizendatu. Mesedez jarri berriz Shared izena.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> @@ -1533,33 +1569,33 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation type="unfinished"/> </message> @@ -1577,16 +1613,6 @@ Ez da gomendagarria erabltzea.</translation> <translation>Sinkronizazio Jarduerak</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Noiz</translation> @@ -1627,34 +1653,34 @@ Ez da gomendagarria erabltzea.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Arbelera kopiatua</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Sinkronizazio egoera arbelera kopiatu da.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation type="unfinished"/> </message> @@ -1662,22 +1688,22 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Hautatu zer sinkronizatu</translation> </message> @@ -1685,20 +1711,31 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Kargatzen...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Izena</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Tamaina</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1708,22 +1745,22 @@ Ez da gomendagarria erabltzea.</translation> <translation>Ezarpenak</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Kontua</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Jarduera</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Orokorra</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Sarea</translation> </message> @@ -1731,27 +1768,27 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Kontua</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Jarduera</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Orokorra</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Sarea</translation> </message> @@ -1764,104 +1801,139 @@ Ez da gomendagarria erabltzea.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>TestuEtiketa</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Elkarbanatu lotura</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Aukeratu pasahitz bat esteka publikorako</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> - <source>Waiting to upload...</source> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> - <source>Unable to register in sync space.</source> + <location filename="../src/gui/sharedialog.cpp" line="608"/> + <source>Waiting to upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> + <location filename="../src/gui/sharedialog.cpp" line="610"/> + <source>Unable to register in sync space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"/> </message> @@ -1882,30 +1954,25 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"/> @@ -1914,113 +1981,113 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>>Ziurtagiriaren Zehaztapenak</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Izen Arrunta (IA):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Erakundea (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Erakunde Atala (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Estatua/Erkidegoa:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Herrialdea:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Jaulkitzailea:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Jaulkitze-data:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Iraungitze-data:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Hatz-markak</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Ziurtagiriaren informazioa:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation type="unfinished"/> @@ -2040,67 +2107,67 @@ Ez da gomendagarria erabltzea.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL Konexioa</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Abisua uneko SSL konexioari buruz:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>%1 ziurtagiriarekin</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;zehaztu gabe&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Erakundea: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Unitatea: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Herrialdea: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Hatz-marka (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Hatz-marka (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Balio-data: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Jaulkitzailea: %1</translation> </message> @@ -2108,219 +2175,229 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Arrakasta.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>csyncen %1 plugina ezin da kargatu.<br/>Mesedez egiaztatu instalazioa!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSyncek errorea izan du barne zuhaitzak prozesatzerakoan.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSyncek huts egin du memoria alokatzean.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>CSync parametro larri errorea.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSync prozesatzearen eguneratu urratsak huts egin du.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync prozesatzearen berdinkatze urratsak huts egin du.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSyncek ezin izan du proxya autentikatu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSyncek huts egin du zerbitzaria edo proxia bilatzean.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSyncek huts egin du %1 zerbitzarian autentikatzean.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSyncek sarera konektatzean huts egin du.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>HTTP transmisio errore bat gertatu da.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSyncek huts egin du kudeatu gabeko baimen ukapen bat dela eta.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSyncek dagoeneko existitzen zen karpeta bat sortzen saiatu da.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Ez dago lekurik %1 zerbitzarian.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSyncen zehaztugabeko errorea.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Erabiltzaileak bertan behera utzita</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Esteka sinbolikoak ezin dira sinkronizatu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Fitxategia baztertutakoen zerrendan dago.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Ezabatzeko baimenik gabe, berrezartzen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Mugitzea ez dago baimenduta, elementua berrezarri da</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Mugitzea ez dago baimenduta %1 irakurtzeko bakarrik delako</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>helburua</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>jatorria</translation> </message> @@ -2328,7 +2405,7 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2336,17 +2413,17 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 type="unfinished"/> </message> @@ -2451,6 +2528,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"/> </message> <message> @@ -2497,7 +2575,7 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"/> </message> @@ -2594,7 +2672,7 @@ Ez da gomendagarria erabltzea.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"/> </message> @@ -2771,12 +2849,12 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> @@ -2784,82 +2862,87 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Deskargatua</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Igoa</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Ezabatuta</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>%1era mugituta</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Errorea</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Ezezaguna</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>deskargatzen</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>igotzen</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>ezabatzen</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>mugitzen</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>errorea</translation> </message> @@ -2867,52 +2950,52 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Definitu gabeko egoera</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Itxoiten sinkronizazioaren hasiera</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Sinkronizazioa martxan da</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Sinkronizazioa ongi burutu da</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation>Sinkronizazioa ongi burutu da, fitxategi batzuk baztertu dira.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Sinkronizazio Errorea</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Konfigurazio Errorea</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Sinkronizazioa prestatzen</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Bertan-behera uzten</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Sinkronizazioa pausatuta dago</translation> </message> diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 12e31d3fe..4d1409463 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -30,27 +30,27 @@ <translation>فرم</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>بازنمایی</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>پوشه ها</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>برچسب متنی</translation> </message> @@ -134,96 +134,96 @@ <translation>از سر گیری</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>قبول کردن پاک شدن پوشه</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p> آیا شما می خواهید همگام سازی پوشه را متوقف کنید<i>%1</i>?</p><p><b> یادداشت:</b> این فایل ها از کاربر شما حذف نخواهند شد.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>قبول تنظیم مجدد پوشه</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>همگام سازی در حال اجراست</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <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="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>بدون %1 اتصال پیکربندی شده.</translation> </message> @@ -256,12 +256,12 @@ Total time left %5</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation type="unfinished"/> </message> @@ -292,33 +292,38 @@ Total time left %5</source> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation type="unfinished"/> </message> @@ -326,30 +331,38 @@ Total time left %5</source> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>پوشه محلی %1 موجود نیست.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 باید یک پوشه باشد اما نیست.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 قابل خواندن نیست.</translation> </message> @@ -463,62 +476,62 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>نمی تواند حالت پوشه را تنظیم مجدد کند</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>موقعیت تعریف نشده</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>صبر کنید تا همگام سازی آغاز شود</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>آماده سازی برای همگام سازی کردن.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>همگام سازی در حال اجراست</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>آخرین همگام سازی موفقیت آمیز بود</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>خطا در پیکر بندی.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>خارج کردن کاربر.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>همگام سازی فعلا متوقف شده است</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -545,8 +558,8 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>ایجاد پوشه</translation> </message> @@ -554,67 +567,67 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>شما اجازه نوشتن در پوشه های انتخاب شده را ندارید!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>در حال حاضر یک پوشه پیکربندی شده در ورودی فعلی موجود است.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>نام مستعار نمی تواند خالی باشد. لطفا یک کلمه مستعار توصیفی ارائه دهید.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>پوشه ی اصلی را انتخاب کنید</translation> </message> @@ -622,42 +635,47 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>پوشه با موفقیت ایجاد شده است %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation type="unfinished"/> </message> @@ -665,7 +683,7 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> @@ -673,31 +691,35 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>اخطار:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>تایم اوت اتصال</translation> </message> @@ -754,12 +776,12 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>رمز را وارد کنید</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation type="unfinished"/> </message> @@ -833,8 +855,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&جستجو: </translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -873,19 +895,19 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> + <source>Could not write to log file %1</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>خطا</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation type="unfinished"/> </message> @@ -893,7 +915,7 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> @@ -901,27 +923,27 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>نسخه جدید در دسترس است</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>نادیده گرفتن این زمان</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>به دست آوردن به روز رسانی</translation> </message> @@ -1030,53 +1052,53 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation type="unfinished"/> </message> @@ -1104,28 +1126,33 @@ for additional privileges during the process.</source> <translation>%1 پوشه '%2' با پوشه محلی همگام شده است '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>خطا:</strong> شما در حال حاضر پوشه های متعدد پیکربندی شده دارید. اگرشما با تنظیمات فعلی ادامه دهید، پیکربندی های پوشه حذف خواهد شد و یک همگام سازی پوشه ریشه ایجاد خواهد شد! </small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>پوشه همگام سازی محلی</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation type="unfinished"/> </message> @@ -1143,7 +1170,7 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation type="unfinished"/> </message> @@ -1185,129 +1212,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <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="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>تلاش برای اتصال %1 به %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>ایجاد پوشه همگام سازی محلی %1...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>خوب</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>ناموفق.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>نمی تواند پوشه محلی ایجاد کند %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>خطا: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>ایجاد کردن پوشه بر روی ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>پوشه از راه دور %1 با موفقیت ایجاد شده است.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>در حال حاضر پوشه از راه دور %1 موجود است. برای همگام سازی به آن متصل شوید.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>با موفقیت به %1 اتصال یافت!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>اتصال به %1 نمی تواند مقرر باشد. لطفا دوباره بررسی کنید.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>تغییر نام پوشه ناموفق بود</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b> پوشه همگام سازی محلی %1 با موفقیت ساخته شده است!</b></font></translation> </message> @@ -1346,7 +1383,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>تایم اوت اتصال</translation> </message> @@ -1354,7 +1391,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"/> </message> @@ -1390,17 +1427,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -1408,17 +1445,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -1426,12 +1463,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1439,17 +1476,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1457,7 +1494,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1465,44 +1502,44 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> @@ -1528,33 +1565,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation type="unfinished"/> </message> @@ -1572,16 +1609,6 @@ It is not advisable to use it.</source> <translation>فعالیت همگام سازی</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>زمان</translation> @@ -1622,34 +1649,34 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>کپی به کلیپ بورد</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation type="unfinished"/> </message> @@ -1657,22 +1684,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation type="unfinished"/> </message> @@ -1680,20 +1707,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>درحال بارگذاری...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>نام</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>اندازه</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1703,22 +1741,22 @@ It is not advisable to use it.</source> <translation>تنظیمات</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>حساب کاربری</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>فعالیت</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>عمومی</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation type="unfinished"/> </message> @@ -1726,27 +1764,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>حساب کاربری</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>فعالیت</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>عمومی</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation type="unfinished"/> </message> @@ -1759,104 +1797,139 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>برچسب متنی</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>اشتراک گذاشتن لینک</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> - <source>Waiting to upload...</source> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> - <source>Unable to register in sync space.</source> + <location filename="../src/gui/sharedialog.cpp" line="608"/> + <source>Waiting to upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> + <location filename="../src/gui/sharedialog.cpp" line="610"/> + <source>Unable to register in sync space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"/> </message> @@ -1877,30 +1950,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"/> @@ -1909,113 +1977,113 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>کشور:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation type="unfinished"/> @@ -2035,67 +2103,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>اتصال SSL </translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>هشدار در مورد اتصال SSL فعلی:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>با گواهی %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt؛ مشخص نشده است &gt؛</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>سازماندهی : %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>واحد: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>کشور: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>اثر انگشت (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>اثرانگشت (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>تاریخ موثر: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>صادرکننده: %1</translation> </message> @@ -2103,219 +2171,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>موفقیت</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>ماژول %1 برای csync نمی تواند بارگذاری شود.<br/>لطفا نصب را بررسی کنید!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync هنگام پردازش درختان داخلی یک خطا دریافت نمود.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync موفق به رزرو حافظه نشد است.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>مرحله به روز روسانی پردازش CSync ناموفق بود.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>مرحله تطبیق پردازش CSync ناموفق بود.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>عدم موفقیت CSync برای مراجعه به پروکسی یا سرور.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>عدم موفقیت CSync برای اعتبار دادن در %1 سرور.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>عدم موفقیت CSync برای اتصال به شبکه.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>خطا در انتقال HTTP اتفاق افتاده است.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync برای ایجاد یک پوشه که در حال حاضر موجود است تلاش کرده است.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: فضا در %1 سرور در دسترس نیست.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>خطای نامشخص CSync </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation type="unfinished"/> </message> @@ -2323,7 +2401,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2331,17 +2409,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 type="unfinished"/> </message> @@ -2446,6 +2524,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"/> </message> <message> @@ -2492,7 +2571,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"/> </message> @@ -2589,7 +2668,7 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"/> </message> @@ -2766,12 +2845,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> @@ -2779,82 +2858,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>دریافت شده اند</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>بارگذاری شده است.</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>حذف شده</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>خطا</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>نامشخص</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>خطا</translation> </message> @@ -2862,52 +2946,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation type="unfinished"/> </message> diff --git a/translations/client_fi.ts b/translations/client_fi.ts index 4813119ad..78e70a0ff 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -30,27 +30,27 @@ <translation>Lomake</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Valitse etäkohdekansio</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Luo kansio</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Päivitä</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Kansiot</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -134,97 +134,97 @@ <translation>Jatka</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Vahvista kansion poisto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Haluatko varmasti lopettaa kansion <i>%i</i> synkronoinnin?</p><p><b>Huomio:</b> Tämä valinta ei poista tiedostoja asiakkaalta.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Vahvista kansion alustus</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Synkronointi meneillään</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3/%4) %5 jäljellä nopeudella %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1/%2, tiedosto %3/%4 Aikaa jäljellä yhteensä %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>tiedosto %1/%2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) / %2 palvelimen tilasta käytössä.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Tallennustilan käyttötietoja ei ole juuri nyt saatavilla.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Muodostetty yhteys kohteeseen <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Yhdistetty kohteeseen <a href="%1">%2</a> käyttäjänä <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Ei yhteyttä %1iin osoitteessa <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>%1-yhteyttä ei ole määritelty.</translation> </message> @@ -257,12 +257,12 @@ Aikaa jäljellä yhteensä %5</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Valitse varmenne</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Varmennetiedostot (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Aikaa jäljellä yhteensä %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>ownCloud-tiliä ei ole määritelty</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Määritelty palvelin on ohjelmistoversioltaan liian vanha tälle asiakasohjelmistolle</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Päivitä uusimpaan palvelinversioon ja käynnistä asiakasohjelmisto uudelleen.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Yhteys %1iin epäonnistui</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>aikakatkaisu</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Annetut tilitiedot eivät ole oikein</translation> </message> @@ -327,30 +332,38 @@ Aikaa jäljellä yhteensä %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Paikallista kansiota %1 ei ole olemassa.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 ei ole luettavissa.</translation> </message> @@ -462,62 +475,62 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Kansion tilaa ei voitu alustaa</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Määrittelemätön tila.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Odottaa synkronoinnin alkamista.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Valmistellaan synkronointia.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Synkronointi on meneillään.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Asetusvirhe.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Synkronointi on keskeytetty.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synkronointi on keskeytetty)</translation> </message> @@ -544,8 +557,8 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Lisää kansio</translation> </message> @@ -553,67 +566,67 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Napsauta valitaksesi synkronoitavan paikalliskansion.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Anna paikallisen kansion polku</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Kelvollista paikallista kansiota ei ole valittu!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Sinulla ei ole kirjoitusoikeutta valittuun kansioon!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Tässä on jo olemassa asetettu kansio.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Jo aiemmin määritelty kansio sisältää nyt valitun kansion.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Alias-nimi ei voi olla tyhjä. Anna kuvaava aliassana.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>Alias <i>%1</i> on jo käytöss. Valitse toinen alias.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Valitse lähdekansio</translation> </message> @@ -621,42 +634,47 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Luo etäkansio</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Valitse tämä synkronoidaksesi koko tilin</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Tätä kansiota synkronoidaan jo.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Synkronoit jo kansiota <i>%1</i>, ja se on kansion <i>%2</i> yläkansio.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation type="unfinished"/> </message> @@ -664,7 +682,7 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> @@ -672,31 +690,35 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Varoitus:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Yhteys aikakatkaistiin</translation> </message> @@ -753,12 +775,12 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Anna salasana</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Anna käyttäjän '%2' %1-salasana:</translation> </message> @@ -832,8 +854,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Haku:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -872,19 +894,19 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Lokitiedostoon kirjoitus epäonnistui</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Virhe</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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>Tiedostoa '%1'<br/>ei voida avata kirjoittamista varten.<br/><br/>Lokitulostusta<b>ei</b>pystytä tallentamaan!</nobr></translation> </message> @@ -892,7 +914,7 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> @@ -900,27 +922,27 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Uusi versio saatavilla</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Uusi versio %1-asiakasohjelmistosta on saatavilla.</p><p><b>%2</b> on ladattavissa. Asennettu versio on %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Ohita tämä versio</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Ohita tämän kerran</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Päivitä</translation> </message> @@ -1029,54 +1051,53 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Uusi päivitys valmiina</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Uusi päivitys on valmiina asennettavaksi. Päivitysohjelma -saattaa kysyä lisäoikeuksia toimenpiteen aikana.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Ladataan versiota %1. Odota hetki...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Versio %1 on saatavilla. Käynnistä sovellus uudelleen aloittaaksesi päivityksen.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Päivityksen lataaminen epäonnistui. Napsauta <a href='%1'>tästä</a> ladataksesi päivityksen manuaalisesti.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Päivitysten tarkistus epäonnistui.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Uusi versio %1 on saatavilla. Käytä järjestelmän päivitystyökalua sen asennusta varten.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Tarkistetaan päivityspalvelinta...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Päivityksen tila on tuntematon: uusia päivityksiä ei tarkistettu.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Päivityksiä ei ole saatavilla. Käytössäsi on uusin versio.</translation> </message> @@ -1104,28 +1125,33 @@ saattaa kysyä lisäoikeuksia toimenpiteen aikana.</translation> <translation>%1-kansio '%2' on synkronoitu paikalliseen kansioon '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Varoitus:</strong> Paikallinen kansio ei ole tyhjä. Valitse ratkaisu!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Paikallinen synkronointikansio</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Lisäasetuksien päivitys</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1143,7 +1169,7 @@ saattaa kysyä lisäoikeuksia toimenpiteen aikana.</translation> <translation>Anna käyttäjätunnus</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Päivitä käyttäjätiedot</translation> </message> @@ -1186,129 +1212,139 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Muodostettu yhteys onnistuneesti kohteeseen %1: %2 versio %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Yhteys %1iin osoitteessa %2 epäonnistui:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Yritetään yhdistetää palvelimeen %1 portissa %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Paikallinen kansio %1 on jo olemassa, asetetaan se synkronoitavaksi.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> - <source>Creating local sync folder %1... </source> - <translation>Luodaan paikallista synkronointikansiota %1... </translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>epäonnistui.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>Paikalliskansion %1 luonti epäonnistui</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Etäkansiota ei määritelty!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Virhe: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>luodaan kansio ownCloudiin: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Etäkansio %1 luotiin onnistuneesti.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Etäkansio %1 on jo olemassa. Otetaan siihen yhteyttä tiedostojen täsmäystä varten.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Kansion luonti aiheutti HTTP-virhekoodin %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Etäkansion luominen epäonnistui koska antamasi tunnus/salasana ei täsmää!<br/>Ole hyvä ja palaa tarkistamaan tunnus/salasana</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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">Pilvipalvelun etäkansion luominen ei onnistunut , koska tunnistautumistietosi ovat todennäköisesti väärin.</font><br/>Palaa takaisin ja tarkista käyttäjätunnus ja salasana.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Etäkansion %1 luonti epäonnistui, virhe <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Täsmäysyhteys kansiosta %1 etäkansioon %2 on asetettu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Yhteys kohteeseen %1 muodostettiin onnistuneesti!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Yhteyttä osoitteeseen %1 ei voitu muodostaa. Ole hyvä ja tarkista uudelleen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Kansion nimen muuttaminen epäonnistui</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Paikallinen synkronointikansio %1 luotu onnistuneesti!</b></font></translation> </message> @@ -1347,7 +1383,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Yhteys aikakatkaistiin</translation> </message> @@ -1355,7 +1391,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"/> </message> @@ -1391,17 +1427,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Tiedostoa ei voitu ladata täysin.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -1409,17 +1445,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Palauttaminen epäonnistui: </translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -1427,12 +1463,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>kansion %1 luominen epäonnistui</translation> </message> @@ -1440,17 +1476,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Virhe poistaessa '%1': %2; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1458,7 +1494,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1466,44 +1502,44 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Tätä kansiota ei ole tule nimetä uudelleen. Muutetaan takaisin alkuperäinen nimi.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> @@ -1529,33 +1565,33 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation type="unfinished"/> </message> @@ -1573,16 +1609,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation>Synkronointiaktiviteetti</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Aika</translation> @@ -1623,34 +1649,34 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation>Kopioi toimilista leikepöydälle.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Kopioitu leikepöydälle</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Synkronointitila on kopioitu leikepöydälle.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Yritä synkronoida ne uudelleen.</translation> </message> @@ -1658,22 +1684,22 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Ilman valintaa olevat kansiot <b>poistetaan</b> paikallisesta tiedostojärjestelmästä, eikä niitä synkronoida enää jatkossa tämän tietokoneen kanssa</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Valitse synkronoitavat tiedot</translation> </message> @@ -1681,20 +1707,31 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Ladataan...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Nimi</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Koko</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1704,22 +1741,22 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation>Asetukset</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Tili</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Toimet</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Yleiset</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Verkko</translation> </message> @@ -1727,27 +1764,27 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Tili</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Toimet</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Yleiset</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Verkko</translation> </message> @@ -1760,104 +1797,139 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>TekstiLeima</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>OwnCloud-polku:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Jaa linkki</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Aseta salasana</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Aseta vanhenemispäivä</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Aseta salasana</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Valitse salasana julkiselle linkille</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> - <source>Waiting to upload...</source> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> - <source>Unable to register in sync space.</source> + <location filename="../src/gui/sharedialog.cpp" line="608"/> + <source>Waiting to upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> + <location filename="../src/gui/sharedialog.cpp" line="610"/> + <source>Unable to register in sync space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"/> </message> @@ -1878,30 +1950,25 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Tunnistaudu</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Tunnistaudu uudelleen</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Istunto on vanhentunut. Kirjaudu uudelleen jatkaaksesi sovelluksen käyttämistä.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"/> @@ -1910,114 +1977,114 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Varmenteen tiedot</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organisaatio (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Organisaatioyksikkö (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Maa:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Myöntäjä</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Myöntäjä:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Myönnetty:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Vanhenee:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Sormenjäljet</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Huomio:</b> Tämä varmenne hyväksyttiin käsin</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (allekirjoitettu itse)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Yhteys on salattu, käytössä %1-bittinen %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Varmenteen tiedot:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Yhteys EI OLE turvallinen, koska sitä ei ole salattu. @@ -2038,67 +2105,67 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL-yhteys</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Varoitukset nykyisestä SSL-yhteydestä:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>varmenteella %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;ei määritelty&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organisaatio: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Yksikkö: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Maa: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Sormenjälki (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Sormenjälki (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Voimassa oleva päivämäärä: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Vanhenemispäivä: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Myöntäjä: %1</translation> </message> @@ -2106,219 +2173,229 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Onnistui.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>%1-liitännäistä csyncia varten ei voitu ladata.<br/>Varmista asennuksen toimivuus!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>Csync-synkronointipalvelussa tapahtui virhe sisäisten puurakenteiden prosessoinnissa.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync ei onnistunut varaamaan muistia.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync ei onnistunut yhdistämään verkkoon.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Tapahtui verkon aikakatkaisu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Tapahtui HTTP-välitysvirhe.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync yritti luoda olemassa olevan kansion.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: %1-palvelimella ei ole tilaa vapaana.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSync - määrittämätön virhe.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Keskeytetty käyttäjän toimesta</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Ilmeni sisäinen virhe, jonka numero on %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Kohdetta ei synkronoitu aiempien virheiden vuoksi: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symboliset linkit eivät ole tuettuja synkronoinnissa.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Tiedosto sisältää virheellisiä merkkejä, joiden vuoksi sitä voi synkronoida eri käyttöjärjestelmien välillä.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Ei sallittu, koska sinulla ei ole oikeutta lisätä tiedostoja kyseiseen kansioon</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Poistaminen ei ole sallittua, palautetaan</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Paikalliset tiedostot ja jakokansio poistettu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Siirtäminen ei ole sallittua, kohde palautettu</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Siirto ei ole sallittu, koska %1 on "vain luku"-tilassa</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>kohde</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>lähde</translation> </message> @@ -2326,7 +2403,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2334,17 +2411,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Versio %1. Lisätietoja osoitteessa <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Tekijänoikeus ownCloud, Incorporated</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 type="unfinished"/> </message> @@ -2449,6 +2526,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"/> </message> <message> @@ -2495,7 +2573,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"/> </message> @@ -2592,7 +2670,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation>Määritä asiakaspuolen TLS-varmenteen asetukset</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"/> </message> @@ -2769,12 +2847,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Ilmoitusaluetta ei ole saatavilla</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 vaatii toimivan ilmoitusalueen. Jos käytät XFCE:tä, seuraa <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">näitä ohjeita</a>. Muussa tapauksessa asenna jokin ilmoitusalueen tarjoava sovellus, kuten "trayer" ja yritä uudelleen.</translation> </message> @@ -2782,82 +2860,87 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Ladattu</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Lähetetty</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Poistettu</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Tiedostojärjestelmän käyttövirhe</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Virhe</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Tuntematon</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>ladataan</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>lähetetään</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>poistetaan</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>siirretään</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>virhe</translation> </message> @@ -2865,52 +2948,52 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Tila on määrittelemätön.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Odotetaan synkronoinnin käynnistymistä</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Synkronointi meneillään</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Synkronointi valmistui</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation>Synkronointi onnistui, jotkin tiedostot ohitettiin.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Synkronointivirhe</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Asetusvirhe.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Valmistaudutaan synkronointiin</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Keskeytetään...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Synkronointi on keskeytetty</translation> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 7c40bdc13..f238d04b7 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -30,27 +30,27 @@ <translation>Formulaire</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Veuillez spécifier un répertoire distant</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Créer un dossier</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Rafraîchir</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Dossiers</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>LabelTexte</translation> </message> @@ -134,97 +134,97 @@ <translation>Reprendre</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Confirmer le retrait du dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Voulez-vous réellement arrêter la synchronisation du dossier <i>%1</i> ?</p><p><b>Note : </b> Cela ne supprimera pas les fichiers sur votre client.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Confirmez la réinitialisation du dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Voulez-vous réellement réinitialiser le dossier <i>%1</i> et reconstruire votre base de données cliente ?</p><p><b>Note :</b> Cette fonctionnalité existe pour des besoins de maintenance uniquement. Aucun fichier ne sera supprimé, mais cela peut causer un trafic de données conséquent et peut durer de plusieurs minutes à plusieurs heures, en fonction de la taille du dossier. Utilisez cette option uniquement sur avis de votre administrateur.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Synchronisation en cours</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La synchronisation est en cours.<br/>Voulez-vous l'arrêter ?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Découverte de '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 sur %4) %5 restante(s) à un débit de %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 de %2, fichier %3 de %4 Temps restant total %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>fichier %1 de %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>L'espace disque sur le serveur est utilisé à %3% (%1 sur %2)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Connecté à <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Connecté à <a href="%1">%2</a> en tant que <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Aucune connexion à %1 à <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Aucune connexion à %1 configurée</translation> </message> @@ -257,12 +257,12 @@ Temps restant total %5</translation> <translation>Mot de passe du certificat :</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Sélectionner un certificat</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Fichiers de certificats (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Temps restant total %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Aucun compte ownCloud configuré</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Le serveur configuré pour ce client est trop vieux</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Veuillez mettre à jour le serveur vers la dernière version et redémarrer le client.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Impossible de se connecter à %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>délai d'attente</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Les informations d'identification fournies ne sont pas correctes</translation> </message> @@ -327,30 +332,38 @@ Temps restant total %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Délai de connexion dépassé</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Impossible de créer le contexte csync</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Le dossier local %1 n'existe pas.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 doit être un répertoire, mais ce n'en est pas un.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 ne peut pas être lu.</translation> </message> @@ -464,62 +477,62 @@ Voulez-vous réellement effectuer cette opération ?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Impossible de réinitialiser l'état du dossier</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>Un ancien fichier journal '%1' a été trouvé, mais ne peut être supprimé. Veuillez vous assurer qu’aucune application ne l'utilise en ce moment.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Statut indéfini.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>En attente de synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Préparation de la synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>La synchronisation est en cours.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Dernière synchronisation effectuée avec succès</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>La dernière synchronisation s'est achevée avec succès mais avec des avertissement à propos de certains fichiers.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Erreur d'installation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Abandon par l'utilisateur.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>La synchronisation est en pause.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation en pause)</translation> </message> @@ -546,8 +559,8 @@ Voulez-vous réellement effectuer cette opération ?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Ajouter un dossier</translation> </message> @@ -555,67 +568,67 @@ Voulez-vous réellement effectuer cette opération ?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Cliquez pour choisir un dossier local à synchroniser.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Entrez le chemin du dossier local.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>L'alias du dossier est un nom descriptif pour cette synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Aucun dossier valide sélectionné !</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Vous n'avez pas la permission d'écrire dans le dossier selectionné</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Le chemin d'accès local %1 est déjà un dossier de téléchargement. Veuillez en choisir un autre !</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>L'entrée sélectionnée contient un dossier déjà configuré.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Le dossier sélectionné est un lien symbolique. Un dossier configuré existe déjà dans le répertoire vers lequel le lien pointe.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Le dossier saisi est contenu dans un dossier déjà configuré.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Le dossier sélectionné est un lien symbolique. Un dossier est déjà configuré et est parent du dossier vers lequel ce lien pointe.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>L'alias ne peut pas être vide. Veuillez fournir un nom d'alias explicite.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>L'alias <i>%1</i> est déja utilisé. Veuillez choisir un autre alias.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Sélectionnez le dossier source</translation> </message> @@ -623,42 +636,47 @@ Voulez-vous réellement effectuer cette opération ?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Créer un dossier distant</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Entrez le nom du nouveau dossier à créer dans '%1' :</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Le dossier a été créé sur %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Échec à la création du dossier sur %1. Veuillez vérifier manuellement.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Sélectionnez ceci pour synchroniser l'ensemble du compte</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Ce dossier est déjà en cours de synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Vous synchronisez déja <i>%1</i>, qui est un dossier parent de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Vous sychronisez déjà tous vos fichiers. Synchroniser un autre dossier n'est <b>pas</b> possible actuellement. Si vous voulez synchroniser plusieurs dossiers, veuillez supprimer la synchronisation du dossier racine qui est configurée actuellement.</translation> </message> @@ -666,7 +684,7 @@ Voulez-vous réellement effectuer cette opération ?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Choisissez le contenu à synchroniser : vous pouvez éventuellement désélectionner les sous-dossiers distants que vous ne désirez pas synchroniser.</translation> </message> @@ -674,31 +692,35 @@ Voulez-vous réellement effectuer cette opération ?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Attention :</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Le serveur a retourné une gamme de contenu erronée</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Temps de connexion expiré</translation> </message> @@ -755,12 +777,12 @@ Voulez-vous réellement effectuer cette opération ?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Saisissez le mot de passe</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Veuillez saisir le mot de passe %1 pour l'utilisateur '%2' :</translation> </message> @@ -836,8 +858,8 @@ Les motifs cochés seront également supprimés s'ils empêchent la suppres </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Recherche :</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Les motifs cochés seront également supprimés s'ils empêchent la suppres </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Impossible d'écrire dans le fichier de log</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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>Le fichier '%1'<br/>ne peut être ouvert en écriture.<br/><br/>La sortie <b>ne peut pas</b> être consignée dans le fichier de log !</nobr></translation> </message> @@ -896,7 +918,7 @@ Les motifs cochés seront également supprimés s'ils empêchent la suppres <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Délai de connexion dépassé</translation> </message> @@ -904,27 +926,27 @@ Les motifs cochés seront également supprimés s'ils empêchent la suppres <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Nouvelle version disponible</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Une nouvelle version du client %1 est disponible.</p><p><b>%2</b> est disponible au téléchargement. La version actuellement installée est %3.<p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Ignorer cette version</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Ignorer pour cette fois</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Obtenir la mise à jour</translation> </message> @@ -1033,54 +1055,53 @@ Les motifs cochés seront également supprimés s'ils empêchent la suppres <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Une nouvelle mise à jour est prête</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Une mise à jour est sur le point d'être installée. L'assistant -peut demander des privilèges additionnels durant le processus.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Téléchargement de la version %1. Merci de patienter...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>La version %1 est disponible. Redémarrez l'application pour appliquer la mise à jour.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Impossible de télécharger la mise à jour. <a href='%1'>Veuillez cliquer ici afin de télécharger la mise à jour manuellement.</a></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Impossible de vérifier la présence de nouvelles mises à jour.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>La nouvelle version %1 est disponible. Veuillez utiliser l'utilitaire de mise à jour système afin de l'installer.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Interrogation du serveur de mises à jour...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>L'état du processus de mise à jour est inconnu. Impossible de vérifier la présence de mises à jour.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Aucune mise à jour disponible. Votre installation est à jour.</translation> </message> @@ -1108,28 +1129,33 @@ peut demander des privilèges additionnels durant le processus.</translation> <translation>le dossier %1 '%2' est synchronisé avec le dossier local '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Attention :</strong> Vous avez de multiples dossiers configurés. Si vous continuez avec les nouveaux paramètres, les configuration de dossiers actuelles seront perdues et une synchronisation de la racine de votre compte vers un seul dossier sera mise en place !</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Attention :</strong> Le dossier local n'est pas vide. Résolvez d'abord ce point !</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Dossier de synchronisation local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Mise à jour de la configuration avancée</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1147,7 +1173,7 @@ peut demander des privilèges additionnels durant le processus.</translation> <translation>Saisissez les identifiants de connexion de l'utilisateur</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Modification des identifiants de connexion</translation> </message> @@ -1190,129 +1216,139 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Connecté avec succès à %1 : %2 version %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Échec de la connexion à %1 pour %2 :<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Délai dépassé dans la tentative de connexion de %1 à %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Tentative de connexion à %1 sur %2 ...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 refusé par le serveur. Pour vérifier que vous avez accès, <a href="%1">cliquez ici</a> pour accéder au service avec votre navigateur.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Création du dossier de synchronisation local %1 …</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>échoué.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>Impossible de créer le répertoire local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Aucun dossier distant n'est spécifié !</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Erreur : %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>création d'un répertoire sur ownCloud : %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <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="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <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="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <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="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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 répertoire distant a échoué car les informations d'identification sont erronées !<br/>Veuillez revenir en arrière et les vérifier.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Connecté avec succès à %1 !</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>La connexion à %1 n'a pu être établie. Essayez encore svp.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Echec du renommage du dossier</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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 ces fichiers est ouvert dans un autre programme. Veuillez fermer le dossier ou le fichier et cliquez sur ré-essayer ou annuler l'installation.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <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> @@ -1351,7 +1387,7 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Temps de connexion expiré</translation> </message> @@ -1359,7 +1395,7 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>L'URL interrogé a renvoyé une réponse json invalide</translation> </message> @@ -1395,17 +1431,17 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Le fichier %1 ne peut pas être téléchargé en raison d'un conflit sur le nom du fichier local. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Le fichier n'a pas pu être téléchargé intégralement.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Le fichier %1 n'a pas pu être sauvegardé en raison d'un conflit sur le nom du fichier local !</translation> </message> @@ -1413,17 +1449,17 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Échec de la restauration : </translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Poursuivre la mise sur liste noire :</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Un fichier ou un dossier a été supprimé d'un partage en lecture seule, mais la restauration a échoué : %1</translation> </message> @@ -1431,12 +1467,12 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Attention, collision possible avec %1 à cause de la casse</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>impossible de créer le répertoire %1</translation> </message> @@ -1444,17 +1480,17 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Erreur lors de la suppression de '%1' : %2;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Impossible de supprimer le répertoire '%1';</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Impossible de supprimer %1 à cause d'un conflit local de nom de fichier</translation> </message> @@ -1462,7 +1498,7 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Le fichier %1 ne peut pas être renommé en %2 à cause d'un conflit local de nom de fichier</translation> </message> @@ -1470,45 +1506,45 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Le fichier a été supprimé d'un partage en lecture seule. Il a été restauré.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Le code HTTP retourné par le serveur n'est pas valide. La valeur attendue est 204 mais la valeur reçue est "%1 %2".</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Le code HTTP retourné par le serveur n'est pas valide. La valeur attendue est 201 mais la valeur reçue est "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Ce dossier ne doit pas être renommé. Il sera renommé avec son nom original.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Ce dossier ne doit pas être renommé. Veuillez le renommer en Shared.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Le fichier a été renommé mais appartient à un partage en lecture seule. Le fichier original a été restauré.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Le code HTTP retourné par le serveur n'est pas valide. La valeur attendue est 201 mais la valeur reçue est "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1533,33 +1569,33 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Fichier supprimé</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Fichier local modifié pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de confit.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>URL de sondage manquant</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Fichier local supprimé pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Le serveur n'a pas acquitté le dernier morceau (aucun e-tag n'était présent).</translation> </message> @@ -1577,16 +1613,6 @@ Il est déconseillé de l'utiliser.</translation> <translation>Activité de synchronisation</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Heure</translation> @@ -1627,22 +1653,22 @@ Il est déconseillé de l'utiliser.</translation> <translation>Copier la liste d'activités dans le presse-papier.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Copié dans le presse-papier</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>L'état de synchronisation a été copié dans le presse-papier.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>Actuellement aucun fichier n'a été ignoré en raison d'erreurs précédentes, et aucun téléchargement n'est en cours.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>%n fichiers ont été ignorés à cause d'erreurs précédentes. @@ -1651,7 +1677,7 @@ Il est déconseillé de l'utiliser.</translation> </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n fichiers sont partiellement téléchargés. @@ -1660,7 +1686,7 @@ Il est déconseillé de l'utiliser.</translation> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Essayez de les synchroniser à nouveau.</translation> </message> @@ -1668,22 +1694,22 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Décochez les dossiers qui doivent être <b>supprimés</b> de votre disque local et qui ne doivent pas être synchronisés avec cet ordinateur.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Choisir le contenu à synchroniser : Sélectionnez les sous-dossiers distants que vous voulez synchroniser.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Choisir le contenu à synchroniser : Désélectionnez les sous-dossiers distants que vous ne voulez pas synchroniser.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Choisir le contenu à synchroniser</translation> </message> @@ -1691,20 +1717,31 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Chargement…</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Nom</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Taille</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1714,22 +1751,22 @@ Il est déconseillé de l'utiliser.</translation> <translation>Paramètres</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Compte</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Activité</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Généraux</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Réseau</translation> </message> @@ -1737,27 +1774,27 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Compte</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Activité</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Généraux</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Réseau</translation> </message> @@ -1770,104 +1807,139 @@ Il est déconseillé de l'utiliser.</translation> <translation>Partager NewDocument.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Informations de partage</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>Zone de texte</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>label de partage</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>Chemin OwnCloud :</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Partager le lien</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Configurer le mot de passe</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Configurer la date d'expiration</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Configurer le mot de passe</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1 chemin : %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>Partage %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Protégé par un mot de passe</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Choisissez un mot de passe pour le lien public</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>Code d'erreur OCS API : %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Aucun dossier à synchroniser n'est configuré.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Impossible de trouver un dossier vers lequel téléverser.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>Le partage de dossiers externes n'est pas encore pris en charge.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Un fichier synchronisé portant le même nom existe déjà. Le fichier ne peut pas être enregistré pour synchronisation.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>Le partage de dossiers externes n'est pas encore pris en charge.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>En attente d'envoi...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Impossible de s'enregistrer à l'espace de synchronisation.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Le fichier ne peut pas être synchronisé.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>La synchronisation du fichier n'est pas encore réalisée avec succès.</translation> </message> @@ -1888,30 +1960,25 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Authentifier</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Nouvelle authentification nécessaire</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Votre session a expiré. Vous devez vous connecter à nouveau pour continuer à utiliser le client.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Partager avec %1</translation> @@ -1920,114 +1987,114 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Détails du certificat</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Nom commun (CN) :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Noms alternatifs du sujet :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organisation (O) :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Unité d'organisation (OU) :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>État/Région :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Pays :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Numéro de série :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Émetteur</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Émetteur :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Émis le :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Expire le :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Empreintes numériques</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD5 :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256 :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1 :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Note :</b> Ce certificat a été approuvé manuellement</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (auto-signé)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Cette connexion est chiffrée en utilisant %1 bit %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Informations du certificat :</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Cette connexion n'est PAS sécurisée car elle n'est pas chiffrée. @@ -2048,67 +2115,67 @@ Il est déconseillé de l'utiliser.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>Connexion SSL</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Avertissements sur la connexion SSL actuelle :</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>avec certificat %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;non spécifié&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organisation : %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Unité : %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Pays : %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Empreinte (MD5) : <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Empreinte (SHA1) : <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Date de début de validité : %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Date d'expiration : %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Émetteur : %1</translation> </message> @@ -2116,219 +2183,229 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Succès.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync n’a pu charger ou créer le fichier de journalisation. Veuillez vérifier que vous possédez les droits en lecture et écriture dans le répertoire de synchronisation local.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>CSync a échoué à charger du fichier journal. Le fichier journal est corrompu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Le module additionnel %1 pour csync n'a pas pu être chargé.<br/>Merci de vérifier votre installation !</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>Erreur CSync lors du traitement des arbres internes.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>Erreur lors de l'allocation mémoire par CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>Erreur fatale CSync : mauvais paramètre.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>Erreur CSync lors de l'opération de mise à jour</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>Erreur CSync lors de l'opération de réconciliation</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync n'a pu s'authentifier auprès du proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync n'a pu trouver le proxy ou serveur auquel se connecter.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync n'a pu s'authentifier auprès du serveur %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync n'a pu établir une connexion au réseau.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Le délai d'attente de la connexion réseau a été dépassé.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Une erreur de transmission HTTP s'est produite.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync a échoué en raison d'une erreur de permission non prise en charge.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync n'a pu accéder à</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync a tenté de créer un répertoire déjà présent.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync : Aucun espace disponible sur le serveur %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>Erreur CSync inconnue.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Interrompu par l'utilisateur</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>Le dossier monté est temporairement indisponible sur le serveur</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Une erreur est survenue à l'ouverture d'un dossier</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Une erreur interne numéro %1 s'est produite.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Cet élément n'a pas été synchronisé en raison des erreurs précédentes : %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Les liens symboliques ne sont pas pris en charge par la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Les liens durs (hard links) ne sont pas pris en charge par la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Le fichier est dans la liste des fichiers à ignorer.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Le fichier contient des caractères non valides qui ne peuvent être synchronisés entre plate-formes.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>L'encodage du nom de fichier n'est pas valide</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Impossible d'initialiser un journal de synchronisation.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Impossible d'ouvrir le journal de synchronisation</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignoré à cause de la liste noire "Choisir le contenu à synchroniser".</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Non autorisé car vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Non autorisé car vous n'avez pas la permission d'ajouter des dossiers parents</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Non autorisé car vous n'avez pas la permission d'ajouter des fichiers dans ce dossier</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Non autorisé à supprimer. Restauration</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Fichiers locaux et répertoire de partage supprimés.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Déplacement non autorisé, élément restauré</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Déplacement non autorisé car %1 est en mode lecture seule</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>la destination</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>la source</translation> </message> @@ -2336,7 +2413,7 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1 : %2</translation> </message> @@ -2344,17 +2421,17 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Version %1. Pour plus d'information, visitez <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Copyright ownCloud, Incorporated</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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é par %1 et sous licence GNU General Public License (GPL) Version 2.0.<br/>%2 et le logo %2 sont des marques enregistrées de %1 aux Etats-Unis, dans d'autres pays, ou les deux.</p></translation> </message> @@ -2459,7 +2536,8 @@ Il est déconseillé de l'utiliser.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Plantage maintenant</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2505,7 +2583,7 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Version %2. Pour plus d'informations, consultez <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></translation> </message> @@ -2602,7 +2680,7 @@ Il est déconseillé de l'utiliser.</translation> <translation>Configurer le certificat TLS client</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>Impossible de se connecter à l'adresse sécurisée <em>%1</em>. Que souhaitez-vous faire ?</p></body></html></translation> </message> @@ -2779,12 +2857,12 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Zone de notification non disponible</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 nécessite la présence d'une zone de notification système. Si vous utilisez XFCE, veuillez suivre <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">ces instructions</a>. Sinon, installez une application mettant en place une zone de notification, telle que 'trayer', et essayez à nouveau.</translation> </message> @@ -2792,82 +2870,87 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Construit à partir de la révision Git <a href="%1">%2</a> le %3, %4 en utilisant Qt %5.</small><p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Téléchargé</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Téléversé</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Effacé</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Déplacé vers %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Ignoré</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Erreur d'accès au système de fichiers</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Inconnu</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>téléchargement de</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>téléversement</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>suppression</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>déplacement</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>Ignore</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>erreur</translation> </message> @@ -2875,52 +2958,52 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Statut indéfini</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Synchronisation en attente</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Synchronisation en cours</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Synchronisation réussie</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <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="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Erreur de synchronisation</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Erreur de configuration</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Préparation à la synchronisation</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Annulation...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <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 eae918a22..933b9c731 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -30,27 +30,27 @@ <translation>Formulario</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Seleccione o cartafol remoto de destino</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Crear un cartafol</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Actualizar</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Cartafoles</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>Etiqueta de texto</translation> </message> @@ -134,97 +134,97 @@ <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Confirmar a retirada do cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Confirma que quere deter a sincronización do cartafol <i>%1</i>?</p><p><b>Nota:</b> Isto non retirará os ficheiros no seu cliente.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Confirmar o restabelecemento do cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Confirma que quere restabelecer o cartafol <i>%1</i> e reconstruír as súa base datos no cliente?</p><p><b>Nota:</b> Esta función está deseñada só para fins de mantemento. Non se retirará ningún ficheiro, porén, isto pode xerar un tráfico de datos significativo e levarlle varios minutos ou horas en completarse, dependendo do tamaño do cartafol. Utilice esta opción só se o aconsella o administrador.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Sincronización en proceso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Estase a realizar a sincronización.<br/>Quere interrompela e rematala?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Atopando «%1»</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 de %4) restan %5 a unha taxa de %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 de %2, ficheiro %3 of %4 Tempo total restante %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>ficheiro %1 de %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation> Espazo usado do servidor %1 (%3%) de %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Conectado a <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Sen conexión con %1 en <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Non se configurou a conexión %1.</translation> </message> @@ -257,12 +257,12 @@ Tempo total restante %5</translation> <translation>Contrasinal do certificado :</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Seleccione un certificado</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Ficheiros de certificado (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Tempo total restante %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Non hai configurada ningunha conta ownCloud </translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>O servidor configurado para este cliente é moi antigo</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Actualice ao último servidor e reinicie o cliente.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Non é posíbel conectar con %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>caducidade</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>As credenciais fornecidas non son correctas</translation> </message> @@ -327,30 +332,38 @@ Tempo total restante %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Esgotouse o tempo de conexión</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Non é posíbel crear o contexto csync</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>O cartafol local %1 non existe.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 debería ser un directorio e non o é.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 non é lexíbel.</translation> </message> @@ -464,62 +477,62 @@ Confirma que quere realizar esta operación?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Non foi posíbel restabelecer o estado do cartafol</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Estado sen definir.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Agardando polo comezo da sincronización.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Preparando para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Estase sincronizando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>A última sincronización fíxose correctamente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Erro de configuración.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Interrompido polo usuario.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Sincronización en pausa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (sincronización en pausa)</translation> </message> @@ -546,8 +559,8 @@ Confirma que quere realizar esta operación?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Engadir un cartafol</translation> </message> @@ -555,67 +568,67 @@ Confirma que quere realizar esta operación?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Prema para escoller un cartafol local para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Escriba a ruta ao cartafol local.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>O alias de directorio é un nome descritivo para esta conexión de sincronización.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Non seleccionou ningún cartafol local correcto!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Vostede non ten permiso para escribir neste cartafol!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>A ruta local %1 xa é un cartafol de envío. Escolla outro!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Xa hai un cartafol configurado que xa está dentro da entrada actual.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>O cartafol seleccionado é unha ligazón simbólica. Xa hai un cartafol configurado no cartafol ao que apunta esta ligazón.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Xa hai un cartafol configurado que contén o cartafol que foi indicado.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>O cartafol seleccionado é unha ligazón simbólica. Un cartafol xa configurado é o pai do seleccionado actualmente e contén o cartafol ao que apunta esta ligazón.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>O alcume non pode deixarse baleiro. Déalle un alcume que sexa descritivo.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>O alcume <i>%1</> xa está a seren usado. Escolla outro alcume.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Escolla o cartafol de orixe</translation> </message> @@ -623,42 +636,47 @@ Confirma que quere realizar esta operación?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Crear un cartafol remoto</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Introduza o nome do novo cartafol que se creará a seguir «%1»:</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Creouse correctamente o cartafol en %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Non foi posíbel crear o cartafol en %1. Compróbeo manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Escolla isto para sincronizar toda a conta</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Este cartafol xa está sincronizado.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Xa está a sincronizar <i>%1</i>, é o cartafol pai de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Xa se están a sincronizar todos os ficheiros. Isto <b>non</b> é compatíbel co sincronización doutro cartafol. Se quere sincronizar varios cartafoles, retire a sincronización do cartafol raíz configurado actualmente.</translation> </message> @@ -666,7 +684,7 @@ Confirma que quere realizar esta operación?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Escolla que sincronizar: Opcionalmente pode deselecionar subcartafoles remotos que non queira sincronizar.</translation> </message> @@ -674,31 +692,35 @@ Confirma que quere realizar esta operación?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Aviso:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>O servidor devolveu un intervalo de contidos estragado</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Esgotouse o tempo de conexión</translation> </message> @@ -755,12 +777,12 @@ Confirma que quere realizar esta operación?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Escriba o contrasinal</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Escriba o contrasinal %1 para o usuario «%2»:</translation> </message> @@ -836,8 +858,8 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Buscar:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Non foi posíbel escribir no ficheiro de rexistro</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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/> non se pode abrir para escritura.<br/><br/>A saída do rexistro <b>non</n> se pode gardar!</nobr></translation> </message> @@ -896,7 +918,7 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Esgotouse o tempo de conexión</translation> </message> @@ -904,27 +926,27 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Hai dispoñíbel unha nova versión</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Hai dispoñíbel unha nova versión do cliente %1.</p><p>Pode descargar a versión <b>%2</b>. A versión instalada é a %3</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Omitir esta versión</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Omitir polo de agora</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Obter a actualización</translation> </message> @@ -1033,54 +1055,53 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Preparada a nova actualización</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Está a piques de instalarse unha nova actualización. O proceso de -actualización pode pedir privilexios adicionais durante o proceso.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Descargando a versión %1. Agarde...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Dispoñíbel a versión %1. Reinicie a aplicación para iniciar a actualización.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Non foi posíbel descargar a actualización. Prema <a href='%1'>aquí</a> para descargar manualmente a actualización.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Non foi posíbel comprobar se hai novas actualizacións.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Está dispoñíbel unha nova versión %1. Utilice a ferramenta de actualización do sistema para instalala.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Comprobando o servidor de actualizacións...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>O estado da actualización é descoñecido: non se comprobaron as actualizacións.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Non hai actualizacións dispoñíbeis. A instalación xa está na versión máis recente</translation> </message> @@ -1108,28 +1129,33 @@ actualización pode pedir privilexios adicionais durante o proceso.</translation <translation>O cartafol %1 «%2» está sincronizado co cartafol local «%3»</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Aviso:</strong> Actualmente ten varios cartafoles configurados. Se continúa cos axustes actuais, desbotaranse as configuracións dos cartafoles e crearase un único cartafol raíz de sincronización!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Aviso:</strong> O directorio local non está baleiro. Escolla unha resolución!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Sincronización do cartafol local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Actualizar a configuración avanzada</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1147,7 +1173,7 @@ actualización pode pedir privilexios adicionais durante o proceso.</translation <translation>Escriba as credenciais do usuario</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Actualice as credenciais de usuario</translation> </message> @@ -1190,129 +1216,139 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Conectouse correctamente a %1: %2 versión %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Non foi posíbel conectar con %1 en %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Esgotouse o tempo tentando conectarse a %1 en %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Tentando conectarse a %1 en %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Creando un cartafol local de sincronización %1...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>aceptar</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>fallou.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <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="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Non foi especificado o cartafol remoto!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>creando o cartafol en ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>O cartafol remoto %1 creouse correctamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <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="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <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="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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 por 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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Conectou satisfactoriamente con %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <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="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Non foi posíbel renomear o cartafol</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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 copia de seguranza do cartafol, xa que o cartafol ou un ficheiro está aberto noutro programa Peche o cartafol ou o ficheiro e tenteo de novo, ou cancele a acción.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <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> @@ -1351,7 +1387,7 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Esgotouse o tempo de conexión</translation> </message> @@ -1359,7 +1395,7 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>O URL requirido devolveu unha resposta JSON incorrecta</translation> </message> @@ -1395,17 +1431,17 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Non foi posíbel descargar completamente o ficheiro.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation> </message> @@ -1413,17 +1449,17 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Fallou a restauración:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Continuar as listas negras:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Foi retirado un ficheiro ou directorio desde unha compartición de só lectura, mais non foi posíbel a súa restauración: %1</translation> </message> @@ -1431,12 +1467,12 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Atención, posíbel colisión entre maiúsculas e minúsculas con %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>non foi posíbel crear o directorio %1</translation> </message> @@ -1444,17 +1480,17 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>produciuse un erro ao eliminar «%1»: %2;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Non foi posíbel eliminar o directorio «%1»;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Non é posíbel retirar %1 por mor dunha colisión co nome dun ficheiro local</translation> </message> @@ -1462,7 +1498,7 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Non é posíbel renomear o ficheiro %1 como %2 por mor dunha colisión co nome dun ficheiro local</translation> </message> @@ -1470,45 +1506,45 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Foi retirado un ficheiro desde unha compartición de só lectura. Foi restaurado.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>O servidor devolveu código HTTP incorrecto. Agardábase 204, mais recibiuse «%1 %2».</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>O servidor devolveu código HTTP incorrecto. Agardábase 201, mais recibiuse «%1 %2».</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Non é posíbel renomear este cartafol. Non se lle cambiou o nome, mantense o orixinal.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Non é posíbel renomear este cartafol. Devólvalle o nome ao compartido.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>O ficheiro foi renomeado mais é parte dunha compartición de só lectura. O ficheiro orixinal foi restaurado.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>O servidor devolveu código HTTP incorrecto. Agardábase 201, mais recibiuse «%1 %2».</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1533,33 +1569,33 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Ficheiro retirado</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>O ficheiro local cambiou durante a sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>Non se atopa o URL requirido</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>O ficheiro local retirarase durante a sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>O servidor non recoñeceu o último fragmento. (Non hai e-tag presente)</translation> </message> @@ -1577,16 +1613,6 @@ Recomendámoslle que non o use.</translation> <translation>Actividade de sincronización</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Hora</translation> @@ -1627,29 +1653,29 @@ Recomendámoslle que non o use.</translation> <translation>Copiar a lista da actividade no portapapeis.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Copiado no portapapeis.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>O estado de sincronización foi copiado no portapapeis.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>Actualmente non hai ficheiros ignorados por mor de erros anteriores e non hai descargas en progreso.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>%n ficheiro foi ignorado por mor de erros anteriores.</numerusform><numerusform>%n ficheiros foron ignorados por mor de erros anteriores. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n ficheiro foi descargado só parcialmente. @@ -1657,7 +1683,7 @@ Recomendámoslle que non o use.</translation> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Tente sincronizar estes de novo.</translation> </message> @@ -1665,22 +1691,22 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Os cartafoles non seleccionados van seren <b>eliminados</b> do seu sistema de ficheiros local e non volverán sincronizarse con esta computadora</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Escolla que sincronizar: Seleccione os subcartafoles remotos que quere sincronizar.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Escolla que sincronizar: Desmarque os subcartafoles remotos que non queira sincronizar.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Escolla que sincronizar</translation> </message> @@ -1688,20 +1714,31 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Cargando ...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Nome</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Tamaño</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1711,22 +1748,22 @@ Recomendámoslle que non o use.</translation> <translation>Axustes</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Actividade</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Xeral</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Rede</translation> </message> @@ -1734,27 +1771,27 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Actividade</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Xeral</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Rede</translation> </message> @@ -1767,104 +1804,139 @@ Recomendámoslle que non o use.</translation> <translation>Compartir NovoDocumento.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Compartir Información</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>Etiqueta de texto</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>compartir etiqueta</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>Ruta ao ownCloud:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Ligazón para compartir</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Estabelecer o contrasinal</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Estabelecer a data de caducidade</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Estabelecer o contrasinal</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>Ruta a %1: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>Compartindo %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Protexido con contrasinal</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Escolla un contrasinal para a ligazón pública</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>API OCS API código de erro: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Non hai ningún cartafol de sincronización configurado.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Non é posíbel atopar un cartafol que enviar.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>A compartición de directorios externos aínda non está a funcionar.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Xa existe un ficheiro de sincronización co mesmo nome. Non é posíbel rexistrar o ficheiro para sincronizar.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>A compartición de directorios externos aínda non está a funcionar.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Agardando polo envío...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Non é posíbel facer un rexistro no espazo de sincronización.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Non é posíbel sincronizar o ficheiro.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>A sincronización di ficheiro rexistrado no non foi satisfactoria.</translation> </message> @@ -1885,30 +1957,25 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Autenticado</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>É necesario volver autenticarse</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Caducou a sesión. É necesario que volva a acceder para seguir usando o cliente. </translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Compartir con %1</translation> @@ -1917,114 +1984,114 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Detalles do certificado</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Nome común (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Nomes alternativos do titular:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organización (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Unidade organizativa (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Estado/provincia:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>País</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Serie:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Emisor</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Emisor:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Emitido o:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Caduca o:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Pegadas dixitais</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Nota:</b> Este certificado foi aprobado manualmente</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (autoasinada)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Esta conexión está cifrada empregando %1 a %2 bits. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Información do certificado:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Esta conexión non é segura e non está cifrada. @@ -2045,67 +2112,67 @@ Recomendámoslle que non o use.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>Conexión SSL</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Avisos sobre da conexión SSL actual:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>co certificado %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;sen especificar&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organización: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Unidade: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Pegada dixital (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Pegada dixital (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Data de aplicación: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Data de caducidade: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Emisor: %1</translation> </message> @@ -2113,219 +2180,229 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Correcto.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>Produciuse un fallo do Csync ao cargar ou crear o ficheiro de rexistro. Asegúrese de que ten permisos de lectura e escritura no directorio de sincronización local.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>Produciuse un fallo en CSync ao cargar o ficheiro de rexistro. O ficheiro de rexistro está estragado.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Non foi posíbel cargar o engadido %1 para CSync.<br/>Verifique a instalación!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync tivo un erro ao procesar árbores internas.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>Produciuse un fallo ao reservar memoria para CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>Produciuse un erro fatal de parámetro CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>Produciuse un fallo ao procesar o paso de actualización de CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>Produciuse un fallo ao procesar o paso de reconciliación de CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync non puido autenticarse no proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSYNC no puido atopar o servidor proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync non puido autenticarse no servidor %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSYNC no puido conectarse á rede.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Excedeuse do tempo de espera para a conexión á rede.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Produciuse un erro na transmisión HTTP.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>Produciuse un fallo en CSync por mor dun permiso denegado.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>Produciuse un fallo ao acceder a CSync</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSYNC tenta crear un directorio que xa existe.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Non hai espazo dispoñíbel no servidor %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>Produciuse un erro non especificado de CSync</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Interrompido polo usuario</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>O directorio montado non está temporalmente dispoñible no servidor</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Produciuse un erro ao abrir un directorio</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Produciuse un erro interno número %1</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Este elemento non foi sincronizado por mor de erros anteriores: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>As ligazóns simbolicas non son admitidas nas sincronizacións</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>As ligazóns duras non son admitidas nas sincronizacións</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>O ficheiro está na lista de ignorados.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>O ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>O nome de ficheiro codificado non é correcto</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Non é posíbel preparar un rexistro de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Non foi posíbel abrir o rexistro de sincronización</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado por mor da lista negra de «escolla que sincronizar»</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Non está permitido xa que non ten permiso para engadir subdirectorios nese directorio</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Non está permitido xa que non ten permiso para engadir un directorio pai</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Non está permitido xa que non ten permiso para engadir ficheiros nese directorio</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Non está permitido retiralo, restaurando</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Retirados os ficheiros locais e o cartafol compartido.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Nos está permitido movelo, elemento restaurado</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Bon está permitido movelo xa que %1 é só de lectura</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>o destino</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>a orixe</translation> </message> @@ -2333,7 +2410,7 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2341,17 +2418,17 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Versión %1. Para obter máis información visite <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Copyright ownCloud, Incorporated</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 baixo a Licenza Pública Xeral (GPL) GNU Versión 2.0.<br/>Os logotipos %2 e %2 son marcas rexistradas de %1 nos Estados Unidos de Norte América e/ou outros países.</p></translation> </message> @@ -2456,7 +2533,8 @@ Recomendámoslle que non o use.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Quebrou agora</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2502,7 +2580,7 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Versión %2. Para obter máis información visite <a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e outros.</small></p><p>Copyright ownCloud, Inc.</p><p>Licenciado baixo a Licenza Publica Xeral (GPL) GNU Version 2.0<br/>ownCloud e o logotipo ownCloud son marcas rexistradas da ownCloud, Inc. nos EE.UU de Norte América, noutros países ou en ambos.</p></translation> </message> @@ -2599,7 +2677,7 @@ Recomendámoslle que non o use.</translation> <translation>Configurar o certificado TLS do lado do cliente</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>Produciuse un erro ao conectar co enderezo seguro do servidor <em>%1</em>. Como quere proceder?</p></body></html></translation> </message> @@ -2776,12 +2854,12 @@ Recomendámoslle que non o use.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Área de notificación non dispoñíbel</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 require dunha área de notificación. Se está executando XFCE, siga <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">estas instrucións</a>. Senón, instale unha aplicación de área de notificación como «trayer» e ténteo de novo.</translation> </message> @@ -2789,82 +2867,87 @@ Recomendámoslle que non o use.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Construído a partir de la revisión Git <a href="%1">%2</a> on %3, %4 usando Qt %5.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Descargado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Enviado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Eliminado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Movido a %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Ignorado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Produciuse un erro de acceso ao sistema de ficheiros</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Descoñecido</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>descargando</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>enviando</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>eliminando</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>movendo</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>ignorando</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>erro</translation> </message> @@ -2872,52 +2955,52 @@ Recomendámoslle que non o use.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Estado sen definir</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Agardando o comezo da sincronización</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Sincronización en proceso</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Sincronización realizada</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <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="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Produciuse un erro de sincronización</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Erro de configuración</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Preparando para sincronizar</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Interrompendo</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Sincronización en pausa</translation> </message> diff --git a/translations/client_hu.ts b/translations/client_hu.ts index 9b0d8ac4d..89bd7b2f4 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -30,27 +30,27 @@ <translation>Űrlap</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Mappa létrhozása</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Frissítés</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Mappák</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -134,96 +134,96 @@ <translation>Folytatás</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Könyvtár törlésének megerősítése</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Mappa visszaállítás megerősítése</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Szinkronizálás fut</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>A szinkronizálás folyamatban van. <br/>Szakítsuk meg?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>'%1' felderítése</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Nincs beállított kapcsolat: %1.</translation> </message> @@ -256,12 +256,12 @@ Total time left %5</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation type="unfinished"/> </message> @@ -292,33 +292,38 @@ Total time left %5</source> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation type="unfinished"/> </message> @@ -326,30 +331,38 @@ Total time left %5</source> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>%1 helyi mappa nem létezik.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 könyvtár kell legyen, de nem az.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 nem olvasható.</translation> </message> @@ -461,62 +474,62 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Ismeretlen állapot.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Várakozás a szinkronizálás elindítására.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Előkészítés szinkronizációhoz.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Szinkronizálás fut.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Legutolsó szinkronizálás sikeres volt.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Beállítás hiba.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Szinkronizálás megállítva.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -543,8 +556,8 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Mappa hozzáadása</translation> </message> @@ -552,67 +565,67 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Egy már beállított mappa szerepel a jelen bejegyzésben.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Az álnév nem lehet üres. Adjon meg egy leíró álnevet.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Forrás könyvtár kiválasztása</translation> </message> @@ -620,42 +633,47 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>A mappa sikeresen létrehozva: %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Ez a mappa már szinkronizálva van.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation type="unfinished"/> </message> @@ -663,7 +681,7 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> @@ -671,31 +689,35 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation type="unfinished"/> </message> @@ -752,12 +774,12 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Jelszómegadás</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation type="unfinished"/> </message> @@ -831,8 +853,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Keresés: </translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -871,19 +893,19 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>A naplófájl írása sikertelen </translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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' fájlt<br/>nem lehet írásra megnyitni.<br/><br/>A naplózás kimenete <b>nem</b> menthető!</nobr></translation> </message> @@ -891,7 +913,7 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> @@ -899,27 +921,27 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Új verzió érhető el</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Kihagyás ezalkalommal</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Frissítés beszerzése</translation> </message> @@ -1028,53 +1050,53 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Nem ellenőrzi a frissítéseket.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Nincs újabb kiadás. Ez a legfrissebb verzió.</translation> </message> @@ -1102,28 +1124,33 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Helyi Sync mappa</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation type="unfinished"/> </message> @@ -1141,7 +1168,7 @@ for additional privileges during the process.</source> <translation>Azonosítási adatok megadása</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Azonosítási adatok módosítása</translation> </message> @@ -1183,129 +1210,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Sikeresen csatlakozott az %1-hoz: %2 verziószám %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Próbál kapcsolódni az %1-hoz: %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>A helyi %1 mappa már létezik, állítsa be a szinkronizálódását.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> - <source>Creating local sync folder %1... </source> - <translation>Helyi %1 szinkronizációs mappa létrehozása...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation> sikertelen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Hiba: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>%1 távoli nappa sikeresen létrehozva.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>A %1 távoli mappa már létezik. Csatlakoztassa a szinkronizációhoz.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A könyvtár létrehozásakor keletkezett HTTP hibakód %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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 távoli mappa létrehozása sikertelen, valószínűleg mivel hibásak a megdott hitelesítési adatok.</font><br/>Lépjen vissza és ellenőrizze a belépési adatokat.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>A távoli %1 mappa létrehozása nem sikerült. Hibaüzenet: <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>A szinkronizációs kapcsolat a %1 és a %2 távoli mappa között létrejött.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Sikeresen csatlakozva: %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>A kapcsolat a %1 kiszolgálóhoz sikertelen. Ellenőrizze újra.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>A mappa átnevezése nem sikerült</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Helyi %1 szinkronizációs mappa sikeresen létrehozva!</b></font></translation> </message> @@ -1344,7 +1381,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation type="unfinished"/> </message> @@ -1352,7 +1389,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"/> </message> @@ -1388,17 +1425,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -1406,17 +1443,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -1424,12 +1461,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1437,17 +1474,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1455,7 +1492,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1463,44 +1500,44 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> @@ -1526,33 +1563,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation type="unfinished"/> </message> @@ -1570,16 +1607,6 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Idő</translation> @@ -1620,34 +1647,34 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Bemásolva a vágólapra</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation type="unfinished"/> </message> @@ -1655,22 +1682,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Szinkronizálandó elemek kiválasztása</translation> </message> @@ -1678,20 +1705,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Betöltés ...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Név</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Méret</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1701,22 +1739,22 @@ It is not advisable to use it.</source> <translation>Beállítások</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Fiók</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Aktivitás</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Általános</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Hálózat</translation> </message> @@ -1724,27 +1762,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Fiók</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Aktivitás</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Általános</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Hálózat</translation> </message> @@ -1757,104 +1795,139 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Megosztás hivatkozással</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Válasszon egy jelszót a nyilvános linkhez</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> - <source>Waiting to upload...</source> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> - <source>Unable to register in sync space.</source> + <location filename="../src/gui/sharedialog.cpp" line="608"/> + <source>Waiting to upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> + <location filename="../src/gui/sharedialog.cpp" line="610"/> + <source>Unable to register in sync space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"/> </message> @@ -1875,30 +1948,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"/> @@ -1907,113 +1975,113 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Tanúsítvány részletei</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Általános név (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>A tárgy további nevei:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Szervezet (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Szervezeti egység (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Tagállam/Megye:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Ország:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Sorozatszám:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Kibocsátó</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Aláíró:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Kibocsátva:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Lejárat:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Ujjlenyomatok</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Megjegyzés:</b> A tanúsítvány kézileg jóváhagyva</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (önaláírt)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Tanúsítvány adatok:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation type="unfinished"/> @@ -2033,67 +2101,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL-kapcsolat</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>SSL kapcsolat figyelmeztetés:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>%1 tanúsítvánnyal</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;nincs megadva&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Szervezet: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Egység: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Ország: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Ellenőrzőkód (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Ellenőrzőkód (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Tényleges dátum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Kibocsátó: %1</translation> </message> @@ -2101,219 +2169,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Sikerült.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Az %1 beépülőmodul a csync-hez nem tölthető be.<br/>Ellenőrizze a telepítést!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>A CSync hibába ütközött a belső adatok feldolgozása közben.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>Hiba a CSync memórifoglalásakor.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>CSync hibás paraméterhiba.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSync frissítés feldolgozása meghíusult.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync egyeztetési lépés meghíusult.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>A CSync nem találja a proxy kiszolgálót.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>A CSync nem tuja azonosítani magát a %1 kiszolgálón.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync hálózati kapcsolódási hiba.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>HTTP átviteli hiba történt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync hiba, nincs kezelési jogosultság.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>A CSync megpróbált létrehozni egy már létező mappát.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Nincs szabad tárhely az %1 kiszolgálón.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSync ismeretlen hiba.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation type="unfinished"/> </message> @@ -2321,7 +2399,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation type="unfinished"/> </message> @@ -2329,17 +2407,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 type="unfinished"/> </message> @@ -2444,6 +2522,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"/> </message> <message> @@ -2490,7 +2569,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"/> </message> @@ -2587,7 +2666,7 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"/> </message> @@ -2764,12 +2843,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> @@ -2777,82 +2856,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Letöltve</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Feltöltve</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Törölve</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Ismeretlen</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>letöltés folyamatban</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>feltöltés folyamatban</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>hiba</translation> </message> @@ -2860,52 +2944,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Meghatározatlan állapit</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation type="unfinished"/> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index b37cb5b10..385a52158 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -30,27 +30,27 @@ <translation>Modulo</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Seleziona una cartella remota di destinazione </translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Crea cartella</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Aggiorna</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Cartelle</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>EtichettaTesto</translation> </message> @@ -134,97 +134,97 @@ <translation>Riprendi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Conferma la rimozione della cartella</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Vuoi davvero fermare la sincronizzazione della cartella <i>%1</i>?</p><p><b>Nota:</b> ciò non rimuoverà i file dal tuo client.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Conferma il ripristino della cartella</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Vuoi davvero ripristinare la cartella <i>%1</i> e ricostruire il database del client?</p><p><b>Nota:</b> questa funzione è destinata solo a scopi di manutenzione. Nessun file sarà rimosso, ma può causare un significativo traffico di dati e richiedere diversi minuti oppure ore, in base alla dimensione della cartella. Utilizza questa funzione solo se consigliata dal tuo amministratore.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>La sincronizzazione è in corso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Rilevamento '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 di %4). %5 rimanenti a una velocità di %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 di %4)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 di %2, file %3 di %4 Totale tempo rimanente %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>file %1 di %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) di %2 spazio in uso sul server.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Connesso a <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Connesso a <a href="%1">%2</a> come <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Nessuna connessione a %1 su <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Nessuna connessione di %1 configurata.</translation> </message> @@ -257,12 +257,12 @@ Totale tempo rimanente %5</translation> <translation>Password del certificato:</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Seleziona un certificato</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>File di certificato (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Totale tempo rimanente %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Nessun account ownCloud configurato.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Il server configurato per questo client è troppo datato</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Aggiorna all'ultima versione del server e riavvia il client.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Impossibile connettersi a %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>timeout</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Le credenziali fornite non sono corrette</translation> </message> @@ -327,30 +332,38 @@ Totale tempo rimanente %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Connessione scaduta</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Impossibile creare il contesto csync</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>La cartella locale %1 non esiste.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 dovrebbe essere una cartella.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 non è leggibile.</translation> </message> @@ -464,62 +477,62 @@ Sei sicuro di voler eseguire questa operazione?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Impossibile ripristinare lo stato della cartella</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Stato non definito.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Attende l'inizio della sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Preparazione della sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>La sincronizzazione è in corso.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>L'ultima sincronizzazione è stato completata correttamente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Errore di configurazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Interrotto dall'utente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>La sincronizzazione è sospesa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation> %1 (La sincronizzazione è sospesa)</translation> </message> @@ -546,8 +559,8 @@ Sei sicuro di voler eseguire questa operazione?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Aggiungi cartella</translation> </message> @@ -555,67 +568,67 @@ Sei sicuro di voler eseguire questa operazione?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Fai clic per selezionare una cartella locale da sincronizzare.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Digita il percorso della cartella locale.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>L'alias della cartella è un nome descrittivo per questa connessione di sincronizzazione. </translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Non è stata selezionata una cartella valida!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Non hai i permessi di scrittura per la cartella selezionata!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Il percorso locale %1 è già una cartella di caricamento. Selezionane un altro!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Una cartella già configurata è contenuta nella voce corrente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>La cartella selezionata è un collegamento simbolico. Una cartella già configurata è contenuta nella cartella alla quale punta questo collegamento. </translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Una cartella già configurata contiene la cartella appena digitata.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>La cartella selezionata è un collegamento simbolico. Una cartella già configurata è contenuta nella cartella alla quale punta questo collegamento. </translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>L'alias non può essere vuoto. Fornisci un alias significativo.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>L'alias <i>%1</i> è già in uso. Scegli un altro alias.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Seleziona la cartella di origine</translation> </message> @@ -623,42 +636,47 @@ Sei sicuro di voler eseguire questa operazione?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Crea cartella remota</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Digita il nome della nuova cartella da creare sotto a '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>La cartella è stata creata correttamente su %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Non è stato possibile creare la cartella su %1. Controlla manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Selezionala per sincronizzare l'intero account</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Questa cartella è già sincronizzata.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Stai già sincronizzando <i>%1</i>, che è la cartella superiore di <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Stai già sincronizzando tutti i tuoi file. La sincronizzazione di un'altra cartella <b>non</b> è supportata. Se vuoi sincronizzare più cartelle, rimuovi la configurazione della cartella principale di sincronizzazione.</translation> </message> @@ -666,7 +684,7 @@ Sei sicuro di voler eseguire questa operazione?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Scegli cosa sincronizzare: puoi deselezionare opzionalmente le sottocartelle remote che non desideri sincronizzare.</translation> </message> @@ -674,31 +692,35 @@ Sei sicuro di voler eseguire questa operazione?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Avviso:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Nessun e-tag ricevuto dal server, controlla il proxy/gateway</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Il server ha restituito un content-range errato</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Connessione scaduta</translation> </message> @@ -755,12 +777,12 @@ Sei sicuro di voler eseguire questa operazione?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Digita password</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Digita la password di %1 per l'utente '%2':</translation> </message> @@ -836,8 +858,8 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Cerca:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Impossibile scrivere il file di log</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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>Il file '%1'<br/>non può essere aperto in scrittura.<br/><br/>Il risultato del log <b>non</b> può essere salvato!</nobr></translation> </message> @@ -896,7 +918,7 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Connessione scaduta</translation> </message> @@ -904,27 +926,27 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Nuova versione disponibile</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Una nuova versione del client %1 è disponibile.</p><p><b>%2</b> è disponibile per lo scaricamento. La versione installata è %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Salta questa versione</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Salta questa volta</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Ottieni l'aggiornamento</translation> </message> @@ -1033,53 +1055,53 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Nuovo aggiornamento pronto</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Un nuovo aggiornamento sta per essere installato. L'aggiornamento potrebbe richiedere privilegi di amministratore durante l'avanzamento.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Scaricamento della versione %1. Attendi...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>La versione %1 è disponibile. Riavvia l'applicazione per iniziare l'aggiornamento.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Impossibile scaricare l'aggiornamento. Fai clic <a href='%1'>qui</a> per scaricare l'aggiornamento manualmente.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Impossibile verificare la presenza di nuovi aggiornamenti.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Nuova versione %1 disponibile. Utilizza lo strumento di aggiornamento di sistema per installarla.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Controllo server degli aggiornamenti...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Lo stato di aggiornamento è sconosciuto. Non è possibile verificare la presenza di nuovi aggiornamenti.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Non ci sono aggiornamenti disponibili. La tua installazione è aggiornata all'ultima versione.</translation> </message> @@ -1107,28 +1129,33 @@ for additional privileges during the process.</source> <translation>La cartella '%2' di %1 è sincronizzata con la cartella locale '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Avviso:</strong> attualmente hai configurato più cartelle. Se procedi con le impostazioni attuali, le configurazioni delle cartelle saranno scartate, mentre sarà creata un'unica cartella radice di sincronizzazione.</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Avviso:</strong> la cartella locale non è vuota. Scegli una soluzione.</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Cartella locale di sincronizzazione</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Aggiorna la configurazione avanzata</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1146,7 +1173,7 @@ for additional privileges during the process.</source> <translation>Digita le credenziali dell'utente</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Aggiorna le credenziali dell'utente</translation> </message> @@ -1189,129 +1216,139 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Connesso correttamente a %1: %2 versione %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Connessione a %1 su %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Tempo scaduto durante il tentativo di connessione a %1 su %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Tentativo di connessione a %1 su %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Creazione della cartella locale di sincronizzazione %1 in corso... </translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>non riuscita.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <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="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Nessuna cartella remota specificata!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Errore: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>creazione cartella su ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <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="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <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="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <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="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Connesso con successo a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <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="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Rinomina della cartella non riuscita</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <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> @@ -1350,7 +1387,7 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Connessione scaduta</translation> </message> @@ -1358,7 +1395,7 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>Risposta JSON non valida dall'URL di richiesta</translation> </message> @@ -1394,17 +1431,17 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Il file %1 non può essere scaricato a causa di un conflitto con un file locale.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Il file non può essere scaricato completamente.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation> </message> @@ -1412,17 +1449,17 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Ripristino non riuscito: </translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Continua la lista nera:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Un file o una cartella è stato rimosso da una condivisione in sola lettura, ma il ripristino non è riuscito: %1</translation> </message> @@ -1430,12 +1467,12 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Attenzione, possibile conflitto relativo all'uso di maiuscole e minuscole con %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>impossibile creare la cartella %1</translation> </message> @@ -1443,17 +1480,17 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Errore durante la rimozione di '%1': %2; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Impossibile rimuovere la cartella '%1';</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Impossibile rimuovere %1 a causa di un conflitto con un file locale</translation> </message> @@ -1461,7 +1498,7 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Il file %1 non può essere rinominato in %2 a causa di un conflitto con il nome di un file locale</translation> </message> @@ -1469,45 +1506,45 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Il file è stato rimosso da una condivisione in sola lettura. È stato ripristinato.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Codice HTTP errato restituito dal server. Atteso 204, ma ricevuto "%1 %2".</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Codice HTTP errato restituito dal server. Atteso 201, ma ricevuto "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Questa cartella non può essere rinominata. Il nome originale è stato ripristinato.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Questa cartella non può essere rinominata. Ripristina il nome Shared.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Il file è stato rinominato, ma è parte di una condivisione in sola lettura. Il file originale è stato ripristinato.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Codice HTTP errato restituito dal server. Atteso 201, ma ricevuto "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1532,33 +1569,33 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>File rimosso</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Un file locale è cambiato durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>URL di richiesta mancante</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Il file locale è stato rimosso durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Il server non ha riconosciuto l'ultimo pezzo. (Non era presente alcun e-tag)</translation> </message> @@ -1576,16 +1613,6 @@ Non è consigliabile utilizzarlo.</translation> <translation>Sincronizza attività</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Ora</translation> @@ -1626,22 +1653,22 @@ Non è consigliabile utilizzarlo.</translation> <translation>Copia l'elenco delle attività negli appunti.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Copiato negli appunti</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Lo stato di sincronizzazione è stato copiato negli appunti.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>Attualmente nessun file è ignorato a causa di errori precedenti e non ci sono scaricamenti in corso.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>%n file è stato ignorato a causa di errori precedenti. @@ -1649,7 +1676,7 @@ Non è consigliabile utilizzarlo.</translation> </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n file è stato scaricato parzialmente. @@ -1657,7 +1684,7 @@ Non è consigliabile utilizzarlo.</translation> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Prova a sincronizzarli nuovamente.</translation> </message> @@ -1665,22 +1692,22 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Le cartelle non marcate saranno <b>rimosse</b> dal file system locale e non saranno sincronizzate più con questo computer</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Scegli cosa sincronizzare: seleziona le sottocartelle remote che desideri sincronizzare.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Scegli cosa sincronizzare: deseleziona le sottocartelle remote che non desideri sincronizzare.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Scegli cosa sincronizzare</translation> </message> @@ -1688,20 +1715,31 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Caricamento in corso...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Nome</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Dimensione</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1711,22 +1749,22 @@ Non è consigliabile utilizzarlo.</translation> <translation>Impostazioni</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Account</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Attività</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Generale</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Rete</translation> </message> @@ -1734,27 +1772,27 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Account</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Attività</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Generale</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Rete</translation> </message> @@ -1767,104 +1805,139 @@ Non è consigliabile utilizzarlo.</translation> <translation>Condividi NuovoDocumento.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Informazioni condivisione</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>EtichettaTesto</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>etichetta di condivisione</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>Percorso di ownCloud:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Condividi collegamento</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>imposta la password</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Imposta la data di scadenza</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>imposta la password</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>Percorso %1: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>Condivisione %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Protetta da password</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Scegli una password per il collegamento pubblico</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>Codice di errore API OCS: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Non è stata configurata alcuna cartella per la sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Impossibile trovare una cartella di destinazione.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>La condivisione di cartelle esterne non funziona ancora.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Un file di sincronizzazione con lo stesso nome esiste già. Il file non può essere registrato per la sincronizzazione.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>La condivisione di cartelle esterne non funziona ancora.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>In attesa di caricamento...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Impossibile registrare nello spazio di sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Il file non può essere sincronizzato.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>La sincronizzazione del file registrato non è stata ancora completata.</translation> </message> @@ -1885,30 +1958,25 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Autenticazione</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Nuova autenticazione richiesta</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>La tua sessione è scaduta. Devi effettuare nuovamente l'accesso per continuare a utilizzare il client.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Condividi con %1</translation> @@ -1917,114 +1985,114 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Dettagli del certificato</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Nome comune (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Nomi alternativi soggetto (SAN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organizzazione (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Unità organizzativa (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Stato/Regione:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Nazione:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Numero di serie:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Emittente</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Emittente:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Emesso il:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Scade il:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Impronte digitali</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Nota:</b> questo certificato è stato approvato manualmente</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (autofirmato)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Questa connessione è cifrata utilizzando %1 bit %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Informazioni sul certificato:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Questa connessione NON è sicura poiché non è cifrata. @@ -2045,67 +2113,67 @@ Non è consigliabile utilizzarlo.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>Connessione SSL</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Errori sulla connessione SSL corrente:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>con certificato %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;non specificato&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organizzazione: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Reparto: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Nazione: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Impronta digitale (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Impronta digitale (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Data effettiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Data di scadenza: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Emittente: %1</translation> </message> @@ -2113,219 +2181,229 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Successo.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync non è riuscito a caricare o a creare il file di registro. Assicurati di avere i permessi di lettura e scrittura nella cartella di sincronizzazione locale.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>CSync non è riuscito a scrivere il file di registro. Il file di registro è danneggiato.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Il plugin %1 per csync non può essere caricato.<br/>Verifica l'installazione!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>Errore di CSync durante l'elaborazione degli alberi interni.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync non è riuscito a riservare la memoria.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>Errore grave di parametro di CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>La fase di aggiornamento di CSync non è riuscita.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>La fase di riconciliazione di CSync non è riuscita.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync non è in grado di autenticarsi al proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync non è riuscito a trovare un proxy o server.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync non è riuscito ad autenticarsi al server %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync non è riuscito a connettersi alla rete.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Si è verificato un timeout della connessione di rete.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Si è verificato un errore di trasmissione HTTP.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>Problema di CSync dovuto alla mancata gestione dei permessi.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync non è riuscito ad accedere</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync ha cercato di creare una cartella già esistente.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: spazio insufficiente sul server %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>Errore non specificato di CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Interrotto dall'utente</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>La cartella montata è temporaneamente indisponibile sul server</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Si è verificato un errore durante l'apertura di una cartella</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>SI è verificato un errore interno numero %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>L'elemento non è sincronizzato a causa dell'errore precedente: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>I collegamenti simbolici non sono supportati dalla sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Gli hard link non sono supportati dalla sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Il file è stato aggiunto alla lista ignorati.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Il file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>La codifica del nome del file non è valida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Impossibile inizializzare il registro di sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Impossibile aprire il registro di sincronizzazione</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Rimozione non consentita, ripristino</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>I file locali e la cartella condivisa sono stati rimossi.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Spostamento non consentito, elemento ripristinato</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Spostamento non consentito poiché %1 è in sola lettura</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>la destinazione</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>l'origine</translation> </message> @@ -2333,7 +2411,7 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2341,17 +2419,17 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Versione %1. Per ulteriori informazioni vedi <a href="%2">3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Copyright ownCloud, Incorporated</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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>Distribuito da %1 e sotto licenza GNU General Public License (GPL) versione 2.0.<br/>%2 e il logo di %2 sono marchi registrati di %1 negli Stati Uniti, in altri paesi o entrambi.</p></translation> </message> @@ -2456,7 +2534,8 @@ Non è consigliabile utilizzarlo.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Chiusura immediata</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2502,7 +2581,7 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Versione %2. Per ulteriori informazioni, visita <a href="%3">%4</a></p><p><small>Di Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e altri.</small></p><p>Copyright ownCloud, Inc.</p><p>Sotto licenza GNU General Public License (GPL) versione 2.0<br/>ownCloud e il logo di ownCloud sono marchi registrati di ownCloud, Inc. negli Stati Uniti, in altri paesi o entrambi</p></translation> </message> @@ -2599,7 +2678,7 @@ Non è consigliabile utilizzarlo.</translation> <translation>Configura certificato TLS lato client</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>Connessione all'indirizzo sicuro del server <em>%1</em> non riuscita. Come desideri procedere?</p></body></html></translation> </message> @@ -2776,12 +2855,12 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Il vassoio di sistema non è disponibile</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 richiede un vassoio di sistema. Se stai usando XFCE, segui <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">queste istruzioni</a>. Altrimenti, installa un'applicazione vassoio di sistema come 'trayer' e riprova.</translation> </message> @@ -2789,82 +2868,87 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Compilato dalla revisione Git <a href="%1">%2</a> il %3, %4 utilizzando Qt %5.</small><p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Scaricato</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Caricato</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Eliminato</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Spostato in %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Ignorato</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Errore di accesso al filesystem</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Sconosciuto</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>scaricamento in corso</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>caricamento in corso</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>eliminazione</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>spostamento</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>ignorare</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>errore</translation> </message> @@ -2872,52 +2956,52 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Stato non definito</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>In attesa di sincronizzazione</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>La sincronizzazione è in corso</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Sincronizzazione completata</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <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="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Errore di sincronizzazione</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Errore di configurazione</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Preparazione della sincronizzazione</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Interruzione in corso...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>La sincronizzazione è sospesa</translation> </message> diff --git a/translations/client_ja.ts b/translations/client_ja.ts index de99bfdc2..6a8ecf43b 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -30,27 +30,27 @@ <translation>フォーム</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>リモートの指定先フォルダーを選択</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>フォルダーを作成</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>同期</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>フォルダー</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>テキストラベル</translation> </message> @@ -134,97 +134,97 @@ <translation>再開</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>フォルダーの削除を確認</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>フォルダー<i>%1</i>の同期を本当に止めますか？</p><p><b>注:</b> これによりクライアントからファイルが削除されることはありません。</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>フォルダーのリセットを確認</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>本当にフォルダー <i>%1</i> をリセットしてクライアントのデータベースを再構築しますか?</p><p><b>注意:</b>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダーのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>同期を実行中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <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="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation> '%1'を検索中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%4 中 %3) 残り時間 %5 利用帯域 %6/s </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%2 のうち %1 , ファイル%4個のうち%3個 残り時間 %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>%1 / %2 ファイル</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>使用中のサーバー領域: %1 (%3%) / %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>現在、利用できるストレージ利用状況はありません。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation><a href="%1">%2</a> へ接続しました。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation> <a href="%1">%2</a> に<i>%3</i>として接続</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation><a href="%2">%3</a> に %1 への接続がありません。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>%1 の接続は設定されていません。</translation> </message> @@ -257,12 +257,12 @@ Total time left %5</source> <translation>証明書のパスワード：</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>証明書を選択</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>証明書ファイル (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Total time left %5</source> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>ownCloudアカウントが設定されていません</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>このクライアントのサーバー設定は古すぎます。</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>サーバーを最新にアップデートして、クライアントを再起動してください。</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>%1 に接続できません</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>タイムアウト</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>入力された資格情報が正しくありません</translation> </message> @@ -327,30 +332,38 @@ Total time left %5</source> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>接続タイムアウト</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>csync-context を作成できません</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>ローカルフォルダー %1 は存在しません。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 はディレクトリのはずですが、そうではないようです。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 は読み込み可能ではありません。</translation> </message> @@ -464,62 +477,62 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>フォルダーの状態をリセットできませんでした</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>未定義の状態。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>同期開始を待機中</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>同期の準備中。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>同期を実行中です。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>最後の同期は成功しました。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>設定エラー。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>ユーザーによる中止。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>同期を一時停止しました。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (同期を一時停止)</translation> </message> @@ -546,8 +559,8 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>フォルダーを追加</translation> </message> @@ -555,67 +568,67 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>同期したいローカルフォルダーをクリックしてください。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>ローカルフォルダーのパスを入力してください。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>このディレクトリのエイリアスは、この同期接続用の記述名です。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>有効なローカルフォルダーが選択されていません！</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>選択されたフォルダーに書き込み権限がありません</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>ローカルパス %1 はアップロードフォルダーです。他のフォルダーを選択してください。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>すでに設定済みのフォルダーは現在のエントリー内に含まれています。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>選択したフォルダーはシンボリックリンクです。このリンクの参照先のフォルダーには、すでに登録されているフォルダーが含まれます。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>すでに設定済みのフォルダーには、現在入力されたフォルダーが含まれています。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>選択されたフォルダーはシンボリックリンクです。このリンクが指している参照元フォルダーを含んだ親フォルダがすでに登録されています。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>エイリアスは空白にすることはできません。適切な単語をエイリアスとして提供してください。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>エイリアス <i>%1</i> はすでに使われています。他のエイリアスを選択してください。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>ソースフォルダーを選択</translation> </message> @@ -623,42 +636,47 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>リモートフォルダーを追加</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <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="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>%1 にフォルダーが作成されました。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>%1 にフォルダーを作成できませんでした。手作業で確認してください。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>アカウント全体を同期する場合はこちらを選択</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>このフォルダーはすでに同期されています。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <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="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>すべてのファイルはすでに同期されています。他のフォルダーの同期は<b>サポートしていません</>。複数のフォルダーを同期したい場合は、現在設定されているルートフォルダー同期設定を削除してください。</translation> </message> @@ -666,7 +684,7 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>何を同期するか選択: 同期したくないリモートのサブフォルダーは、同期対象から外せます。</translation> </message> @@ -674,31 +692,35 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>警告:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>サーバーが間違ったcontent-rangeを返しました</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>接続タイムアウト</translation> </message> @@ -755,12 +777,12 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>パスワードを入力してください</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>ユーザー '%2' の %1 パスワードを入力してください:</translation> </message> @@ -836,8 +858,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>検索(&S):</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>ログファイルに書き込めませんでした</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>エラー</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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> @@ -896,7 +918,7 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>接続タイムアウト</translation> </message> @@ -904,27 +926,27 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>新しいバージョンが利用可能です</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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 です。<p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>今回のバージョンをスキップ</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>今回はスキップ</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>アップデートを取得</translation> </message> @@ -1033,53 +1055,53 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>アップデートの準備完了</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>新しいアップデートのインストール準備ができました。アップデートのインストール中、追加の権限が必要な場合があります。</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>バージョン %1 をダウンロードしています。しばらくお待ちください...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>バージョン %1 が利用可能です。アプリケーションを再起動してアップデートを開始してください。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>アップデートをダウンロードできませんでした。手動でアップデートするには、<a href='%1'>ここ</a> をクリックしてください。 </translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>アップデートを確認できませんでした。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>新しいバージョン %1 が利用可能です。インストールするには、システムのアップデートツールを利用してください。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>アップデートをチェックしています....</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>更新状況が不明です： 更新をチェックしていません。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>利用可能なアップデートはありません。最新版がインストールされています。</translation> </message> @@ -1107,28 +1129,33 @@ for additional privileges during the process.</source> <translation>%1 フォルダー '%2' はローカルフォルダー '%3' と同期しています</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>警告:</strong> 現在、複数のフォルダーを設定しています。現在の設定で続けた場合、フォルダー設定は無視され、単一のルートフォルダーの同期が生成されます！</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory 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="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>ローカル同期フォルダー</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>高度なセットアップを更新</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1146,7 +1173,7 @@ for additional privileges during the process.</source> <translation>ユーザー資格情報を入力</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>ユーザー資格情報を更新</translation> </message> @@ -1188,129 +1215,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <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="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <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="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>%2 の %1 へ接続を試みた際にタイムアウトしました。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>%2 の %1 へ接続を試みています...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>ローカルの同期フォルダー %1 を作成中... </translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>OK</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>失敗。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>ローカルフォルダー %1 を作成できませんでした</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>リモートフォルダーが指定されていません！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>エラー: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>ownCloud上にフォルダーを作成中: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>リモートフォルダー %1 は正常に生成されました。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>リモートフォルダー %1 はすでに存在します。同期のために接続しています。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>フォルダーの作成はHTTPのエラーコード %1 で終了しました</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>%1への接続に成功しました！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>%1 への接続を確立できませんでした。もう一度確認してください。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>フォルダー名の変更に失敗しました。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>ローカルの同期フォルダー %1 は正常に作成されました！</b></font></translation> </message> @@ -1349,7 +1386,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>接続タイムアウト</translation> </message> @@ -1357,7 +1394,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>不正なJSONがポーリングURLから返りました</translation> </message> @@ -1393,17 +1430,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>このファイルのダウンロードは完了しませんでした</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>%1 はローカルファイル名が衝突しているため保存できません！</translation> </message> @@ -1411,17 +1448,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; 復元に失敗: </translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>ブラックリストの続き: </translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>ファイルまたはディレクトリが読み込み専用の共有から削除されましたが、復元に失敗しました: %1</translation> </message> @@ -1429,12 +1466,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>注意: %1 で大文字小文字が競合している可能性</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>ディレクトリ %1 を作成できませんでした</translation> </message> @@ -1442,17 +1479,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>'%1'の削除エラー : %2;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>ディレクトリ '%1'を削除できません;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>%1 はローカルファイル名が衝突しているため削除できませんでした</translation> </message> @@ -1460,7 +1497,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>ファイル %1 はローカルファイル名が衝突しているため %2 に名前を変更できません</translation> </message> @@ -1468,45 +1505,45 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>ファイルが読み込み専用の共有から削除されました。ファイルは復元されました。</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>誤ったHTTPコードがサーバーから返されました。204のはずが,"%1 %2"が返りました。</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>誤ったHTTPコードがサーバーから返されました。201のはずが,"%1 %2"が返りました。</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>このフォルダー名は変更できません。元の名前に戻します。</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>このフォルダー名は変更できません。名前を Shared に戻してください。</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>ファイルの名前が変更されましたが、読み込み専用の共有の一部です。オリジナルのファイルが復元されました。</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>誤ったHTTPコードがサーバーから返されました。201のはずが,"%1 %2"が返りました。</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1531,33 +1568,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>ファイルを削除しました</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>ローカルのファイルが同期中に変更されました。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>ポーリングURLがありません</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>ローカルファイルを同期中に削除します。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>サーバーは最終チャンクを認識しません。(e-tag が存在しません)</translation> </message> @@ -1575,16 +1612,6 @@ It is not advisable to use it.</source> <translation>同期アクティビティ</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>時刻</translation> @@ -1625,36 +1652,36 @@ It is not advisable to use it.</source> <translation>アクティビティ一覧をコピーする</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>クリップボードにコピー</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>同期状況をクリップボードにコピーしました。</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>以前のエラーのため無視したファイルはありません。進行中のダウンロードもありません。</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>以前のエラーのため､%n個のファイルが無視されました。 </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%nファイルのダウンロードが不完全です。 </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>これらをもう一度同期してください。</translation> </message> @@ -1662,22 +1689,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>チェックしていないフォルダはローカルファイルシステムから <b>削除</b>され､このコンピュータと同期されなくなります。</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>同期対象の選択: 同期したいリモートのサブフォルダを選択してください。</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>同期対象の選択: 同期したくないリモートのサブフォルダは、同期対象から外せます。</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>同期フォルダーを選択</translation> </message> @@ -1685,20 +1712,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>読込中 ...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>名前</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>サイズ</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1708,22 +1746,22 @@ It is not advisable to use it.</source> <translation>設定</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>アカウント</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>アクティビティ</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>一般</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>ネットワーク</translation> </message> @@ -1731,27 +1769,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>アカウント</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>アクティビティ</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>一般</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>ネットワーク</translation> </message> @@ -1764,104 +1802,139 @@ It is not advisable to use it.</source> <translation>Share NewDocument.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>共有情報</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>テキストラベル</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>共有ラベル</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>OwnCloudのパス:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>URLで共有</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>パスワードを設定</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>有効期限を設定</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>パスワードを設定</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1 のパス: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>%1 を共有中</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>パスワード保護</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>URLによる共有のパスワードを入力</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>OCS APIエラーコード: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>同期フォルダーが設定されていません。</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>アップロード先のフォルダーが見つかりません。</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>外部ディレクトリの共有はまだ動作していません。</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>同期ファイルと同じ名前のファイルがあります。個のファイルは同期に登録できません。</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>外部ディレクトリの共有はまだ動作していません。</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>アップロード待ち...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>同期スペースの登録ができません。</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>このファイルは同期されません。</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>登録ファイルの同期はまだ成功していません</translation> </message> @@ -1882,30 +1955,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - 認証</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>再認証が必要</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>セッションの期限が切れました。クライアントを使用し続けるには再ログインが必要です。</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>%1 と共有</translation> @@ -1914,114 +1982,114 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>詳細認証情報</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>コモンネーム(CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>サブジェクトの別名:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>組織(O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>部門名(OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>州／県:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>国:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>シリアル番号:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>発行者</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>発行者: %1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>発行日:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>有効期限:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>フィンガープリント</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>注意:</b> この認証は手動で承認されました</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (自己証明書)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>この接続は、%1 を使って、%2 bit で暗号化されています。 </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>認証情報:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>暗号化されていないので、この接続は安全ではありません。 @@ -2042,67 +2110,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL接続</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>今回のSSL接続に対する警告:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>証明書 %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;指定されていません&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>組織名: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>部門名: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>国: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Fingerprint (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Fingerprint (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>発効日: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>有効期限: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>発行者: %1</translation> </message> @@ -2110,219 +2178,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>成功。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSyncはジャーナルファイルの読み込みや作成に失敗しました。ローカルの同期ディレクトリに読み書きの権限があるか確認してください。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>CSyncはジャーナルファイルの読み込みに失敗しました。ジャーナルファイルが破損しています。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>csync 用の %1 プラグインをロードできませんでした。<br/>インストール状態を確認してください！</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSyncは内部ツリーの処理中にエラーに遭遇しました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSyncで使用するメモリの確保に失敗しました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>CSyncの致命的なパラメータエラーです。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSyncの処理ステップの更新に失敗しました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSyncの処理ステップの調停に失敗しました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSyncはそのプロキシで認証できませんでした。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSyncはプロキシもしくはサーバーの参照に失敗しました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSyncは %1 サーバーでの認証に失敗しました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSyncはネットワークへの接続に失敗しました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>ネットワーク接続のタイムアウトが発生しました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>HTTPの伝送エラーが発生しました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSyncは対応できないパーミッション拒否が原因で失敗しました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync はアクセスに失敗しました</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSyncはすでに存在するディレクトリを作成しようとしました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: %1 サーバーには利用可能な空き領域がありません。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSyncの未指定のエラーです。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>ユーザーによって中止されました</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>サーバー上のマウント済ディレクトリが一時的に利用できません。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>ディレクトリを開いている途中にエラーが発生しました。</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>内部エラー番号 %1 が発生しました。</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>このアイテムは以前にエラーが発生したため同期しません: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>同期機能はシンボリックリンクをサポートしていません。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>同期機能は、ハードリンクをサポートしていません。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>ファイルは除外リストに登録されています。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>ファイル名のエンコーディングが無効です。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>同期ジャーナルの初期化ができません。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>同期ジャーナルを開くことができません</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"同期対象先" ブラックリストにより無視されました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>そのディレクトリにサブディレクトリを追加する権限がありません</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>親ディレクトリを追加する権限がありません</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>そのディレクトリにファイルを追加する権限がありません</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <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/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>削除できないので復元しています</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>ローカルファイルと共有フォルダーを削除しました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>移動できないので項目を復元しました</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>%1 は読み取り専用のため移動できません</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>移動先</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>移動元</translation> </message> @@ -2330,7 +2408,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2338,17 +2416,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>バージョン %1. 詳細な情報は<a href='%2'>%3</a>を確認してください。</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Copyright ownCloud, Incorporated</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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> @@ -2453,7 +2531,8 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>クラッシュしました。</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2499,7 +2578,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>バージョン %2 詳細については、<a href="%3">%4</a>をご覧ください。By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>著作権 ownCloud, Inc.<p><p>%4 が配布し、 GNU General Public License (GPL) バージョン2.0 の下でライセンスされています。<br>ownCloud 及び ownCloud のロゴはアメリカ合衆国またはその他の国、あるいはその両方における<br> ownCloud, Inc.の登録商標です。</p></translation> </message> @@ -2596,7 +2675,7 @@ It is not advisable to use it.</source> <translation>クライアントサイドTLS証明書を設定</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>安全なサーバーアドレス <em>%1</em> に接続できませんでした。どのように進めますか？</p></body></html></translation> </message> @@ -2773,12 +2852,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>システムトレイ利用不可</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1は動作しているシステムトレイで必要とします。XFCEを動作させている場合、<a href="http://docs.xfce.org/xfce/xfce4-panel/systray">これらのインストラクション</a>を追ってください。でなければ、「トレイヤー」のようなシステムトレイアプリケーションをインストールして、再度お試しください。</translation> </message> @@ -2786,82 +2865,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small><a href="%1">%2</a> %3, %4 のGitリビジョンからのビルド Qt %5 を利用</small><p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>ダウンロード済み</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>アップロード済み</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>削除済み</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>%1に移動済み</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>除外しました</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>ファイルシステムのアクセスエラー</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>エラー</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>不明</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>ダウンロード中</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>アップロード中</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>削除しています</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>移動しています</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>除外:</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>エラー</translation> </message> @@ -2869,52 +2953,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>未定義の状態</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>同期開始を待っています</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>同期を実行中</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>同期成功</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation>同期が完了しました。一部のファイルが除外されました。</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>同期エラー</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>設定エラー</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>同期の準備中</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>中止しています...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>同期を一時停止</translation> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 37afc5959..0cf765cb7 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -30,27 +30,27 @@ <translation>Formulier</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Kies een externe doelmap</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Map aanmaken</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Vernieuwen</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Mappen</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>Tekstlabel</translation> </message> @@ -134,97 +134,97 @@ <translation>Hervatten</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Bevestig het verwijderen van de map</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Weet u zeker dat u de synchronisatie van map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal de bestanden niet van uw computer verwijderen.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Bevestig map reset</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Wilt u map <i>%1</i> echt resetten en de database opnieuw opbouwen?</p><p><b>Let op:</b> Deze functie is alleen ontworpen voor onderhoudsdoeleinden. Hoewel er geen bestanden worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map. Gebruik deze functie alleen als dit wordt geadviseerd door uw applicatiebeheerder.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Bezig met synchroniseren</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>'%1' onderzoeken</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 of %4) %5 over bij een snelheid van %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 van %4)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 van %2, file %3 van %4 Totaal resterende tijd %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>bestand %1 van %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) van %2 serverruimte in gebruik.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Verbonden met <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Verbonden met <a href="%1">%2</a> als <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Geen verbinding naar %1 op <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Geen %1 connectie geconfigureerd.</translation> </message> @@ -257,12 +257,12 @@ Totaal resterende tijd %5</translation> <translation>Wachtwoord certificaat :</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Selecteer een certificaat</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Certificaat bestanden (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Totaal resterende tijd %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Geen ownCloud-account geconfigureerd</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>De voor dit programma ingestelde server is te oud</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Werk de server bij naar de nieuwste versie en herstart het programma.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Niet in staat om verbinding te maken met %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>time-out</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>De verstrekte inloggegevens zijn niet juist</translation> </message> @@ -327,30 +332,38 @@ Totaal resterende tijd %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Verbinding time-out</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Onmogelijk om een csync-context te maken</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Lokale map %1 bestaat niet.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 zou een map moeten zijn, maar is dit niet.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 is niet leesbaar.</translation> </message> @@ -464,62 +477,62 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Kan de beginstaat van de map niet terugzetten</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Ongedefiniëerde staat</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>In afwachting van synchronisatie.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Synchronisatie wordt voorbereid</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Bezig met synchroniseren.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Laatste synchronisatie was geslaagd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Installatiefout.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Afgebroken door gebruiker.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Synchronisatie gepauzeerd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisatie onderbroken)</translation> </message> @@ -546,8 +559,8 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Voeg map toe</translation> </message> @@ -555,67 +568,67 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Klikken om een lokale map te selecteren voor synchronisatie</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Geef het pad op naar de lokale map.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>De directory aliasnaam is een beschrijvende naam voor deze synchronisatieverbinding.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Geen geldige lokale map geselecteerd!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>U heeft geen permissie om te schrijven naar de geselecteerde map!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Het lokale pad %1 is al een uploadmap. Kies een andere.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Er bestaat een al eerder geconfigureerde map in de huidige opdracht.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>De gekozen map is een symbolic link. De map waarnaar deze link verwijst bevat een reeds geconfigureerde map.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Een reeds geconfigureerde map bevat de nu ingevoerde map.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>De gekozen map is een symbolic link. Een reeds geconfigureerde map is de bovenliggende map van de gekozen map, waarnaar de link verwijst.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>De alias kan niet leeg zijn. Voer een beschrijvende alias in.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>De alias <i>%1</i> is al in gebruik. Kies een andere.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Selecteer de bronmap</translation> </message> @@ -623,42 +636,47 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Externe map aanmaken</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Voer de naam van de hieronder te maken nieuwe map in '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Map is succesvol aangemaakt op %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Aanmaken van de map op %1 mislukt. Controleer handmatig.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Kies dit om uw volledige account te synchroniseren</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Deze map is al gesynchroniseerd.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>U synchroniseert <i>%1</i> al, dat is de bovenliggende map van <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>U bent al uw bestanden al aan het synchroniseren.Het synchroniseren van een andere map wordt <b>niet</b> ondersteund. Als u meerdere mappen wilt synchroniseren moet u de nu geconfigureerde synchronisatie hoofdmap verwijderen.</translation> </message> @@ -666,7 +684,7 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Kies wat u wilt synchroniseren: u kunt optioneel submappen die u niet wilt synchroniseren deselecteren.</translation> </message> @@ -674,31 +692,35 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Waarschuwing:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Server retourneerde verkeerde content-bandbreedte</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Verbindingstime-out</translation> </message> @@ -755,12 +777,12 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Vul het wachtwoord in</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Vul het %1 wachtwoord in voor gebruiker '%2':</translation> </message> @@ -836,8 +858,8 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>Zoek:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Kon niet schrijven naar logbestand</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Fout</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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>Bestand '%1'<br/>kan niet worden geopend voor schrijven.<br/><br/>De logging output kan <b>niet</b> worden weggeschreven!</nobr></translation> </message> @@ -896,7 +918,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Verbinding time-out</translation> </message> @@ -904,27 +926,27 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Nieuwe versie beschikbaar</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Er is een nieuwe versie van de %1 Client beschikbaar.</p><p><b>%2</b> is beschikbaar voor download. De geïnstalleerde versie is %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Deze versie overslaan.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Deze keer overslaan</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Ophalen update</translation> </message> @@ -1033,54 +1055,53 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Nieuwe update is klaar</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Er wordt een nieuwe update geïnstalleerd. De updater kan -vragen om extra autorisaties tijdens installatie.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Downloaden versie %1. Even geduld...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Versie %1 is beschikbaar. Herstart de applicatie om de update te starten.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Kon de download niet bijwerken. Klik <a href='%1'>hier</a> om de download handmatig bij te werken.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Kon niet controleren op updates.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Nieuwe versie %1 beschikbaar. Gebruik de systeemupdate tool om te installeren.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Controleren updateserver...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Update status is onbekend: niet gecontroleerd op nieuwe updates.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Geen updates beschikbaar. Uw installatie is al de laatste versie.</translation> </message> @@ -1108,28 +1129,33 @@ vragen om extra autorisaties tijdens installatie.</translation> <translation>%1 map '%2' is gesynchroniseerd naar de lokale map '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Waarschuwing:</strong> U heeft momenteel meerdere mappen geconfigureerd. Als u doorgaat met de huidige instellingen, zullen de map-configuraties ongedaan worden gemaakt en zal een enkele rootmap worden gemaakt!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Waarschuwing:</strong> De lokale map is niet leeg. Maak een keuze!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Lokale synchronisatiemap</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Update geavanceerde setup</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1147,7 +1173,7 @@ vragen om extra autorisaties tijdens installatie.</translation> <translation>Vul uw inloggegevens in</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Werk de inloggegevens bij</translation> </message> @@ -1190,129 +1216,139 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Succesvol verbonden met %1: %2 versie %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Kon geen verbinding maken met %1 op %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Time-out bij verbinden met %1 om %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Probeer te verbinden met %1 om %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Maak lokale synchronisatiemap %1...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>mislukt.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <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="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Geen externe map opgegeven!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Fout: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>aanmaken map op ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Externe map %1 succesvol gecreërd.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <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="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <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="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Succesvol verbonden met %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <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="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Hernoemen map mislukt</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <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> @@ -1351,7 +1387,7 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Verbindingstime-out</translation> </message> @@ -1359,7 +1395,7 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>Ongeldig JSON antwoord van de peilingen URL</translation> </message> @@ -1395,17 +1431,17 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Bestand %1 kan niet worden gedownload omdat de naam conflicteert met een lokaal bestand</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Het bestand kon niet volledig worden gedownload.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation> </message> @@ -1413,17 +1449,17 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Herstel mislukte: </translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Doorgaan met zwartelijst:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Er is een bestand of map verwijderd van een alleen-lezen share, maar herstellen is mislukt: %1</translation> </message> @@ -1431,12 +1467,12 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Let op, mogelijk conflict hoofdlettergevoeligheid met 1%</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>kon map %1 niet maken</translation> </message> @@ -1444,17 +1480,17 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Fout bij verwijderen '%1': %2;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Kon map '%1' niet verwijderen;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Bestand %1 kon niet worden verwijderd, omdat de naam conflicteert met een lokaal bestand</translation> </message> @@ -1462,7 +1498,7 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Bestand %1 kan niet worden hernoemd naar %2, omdat de naam conflicteert met een lokaal bestand</translation> </message> @@ -1470,45 +1506,45 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Het bestand is verwijderd van een alleen-lezen share. Het is teruggezet.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Foutieve HTTP code ontvangen van de server. Verwacht 204, maar ontvangen "%1 %2".</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Foutieve HTTP code ontvangen van de server. Verwacht 201, maar ontvangen "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Deze map mag niet worden hernoemd. De naam van de map is teruggezet naar de originele naam.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Deze map mag niet worden hernoemd. Verander de naam terug in Gedeeld.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Het bestand is hernoemd, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Foutieve HTTP code ontvangen van de server. Verwacht 201, maar ontvangen "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1533,33 +1569,33 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Bestand verwijderd</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Lokaal bestand gewijzigd bij sync.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>URL peiling ontbreekt</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Het lokale bestand werd verwijderd tijdens sync.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation> </message> @@ -1577,16 +1613,6 @@ We adviseren deze site niet te gebruiken.</translation> <translation>Synchronisatie-activiteit</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Tijd</translation> @@ -1627,22 +1653,22 @@ We adviseren deze site niet te gebruiken.</translation> <translation>Kopieer de activiteitenlijst naar het klembord.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Gekopieerd naar het klembord</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Het synchronisatie overzicht is gekopieerd naar het klembord.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>Er worden op dit moment geen bestanden genegeerd vanwege eerdere fouten er zijn geen downloads bezig.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>%n bestand genegeerd wegens eerdere fouten. @@ -1650,7 +1676,7 @@ We adviseren deze site niet te gebruiken.</translation> </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n bestand gedeeltelijk gedownload. @@ -1658,7 +1684,7 @@ We adviseren deze site niet te gebruiken.</translation> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Probeer deze opnieuw te synchen.</translation> </message> @@ -1666,22 +1692,22 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Niet geselecteerde mappen worden <b>verwijderd</b> van uw lokale bestandssysteem en worden niet meer gesynchroniseerd met deze computer</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Kies wat u wilt synchroniseren: Selecteer externe submappen die u wilt synchroniseren.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Kies wat u wilt synchroniseren: u kunt submappen die u niet wilt synchroniseren deselecteren.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Wat synchroniseren</translation> </message> @@ -1689,20 +1715,31 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Laden ...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Naam</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Grootte</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1712,22 +1749,22 @@ We adviseren deze site niet te gebruiken.</translation> <translation>Instellingen</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Account</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Activiteit</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Algemeen</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Netwerk</translation> </message> @@ -1735,27 +1772,27 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Account</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Activiteit</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Algemeen</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Netwerk</translation> </message> @@ -1768,104 +1805,139 @@ We adviseren deze site niet te gebruiken.</translation> <translation>Delen NieuwDocument.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Delen info</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>Tekstlabel</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>deel label</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>OwnCloud Pad:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Deel link</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Instellen wachtwoord</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Stel vervaldatum in</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Instellen wachtwoord</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1 pad: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>%1 Delen</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Wachtwoord beveiligd</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Kies een wachtwoord voor de openbare link</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>OCS API foutcode: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Er is geen sync map geconfigureerd.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Kan geen map vinden om naar te uploaden.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>Delen van externe mappen werkt nog niet.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Er bestaat al een sync bestand met dezelfde naam. Het bestand kan niet worden aangemeld voor sync.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>Delen van externe mappen werkt nog niet.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Wachten om te uploaden...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Kan niet aanmelden in sync ruimte.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Het bestand kan niet worden gesynchroniseerd.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>Sync van aangemeld bestand nog niet succesvol.</translation> </message> @@ -1886,30 +1958,25 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - authenticeren</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Hernieuwde authenticatie nodig</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Uw sessie is verstreken. U moet opnieuw inloggen om de client-applicatie te gebruiken.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Delen met %1</translation> @@ -1918,114 +1985,114 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Certificaat details</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Common Name (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Alternatieve subject namen:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organisatie (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Organisatie unit (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Land/Provincie:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Land:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Serienummer:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Uitgever</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Uitgever:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Uitgegeven op:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Vervalt op:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Vingerafdrukken</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Let op:</b> Dit certificaat werd handmatig goedgekeurd</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (zelf ondertekend)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Deze verbinding is versleuteld via %1 bit %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Certificaat informatie:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Deze verbinding is NIET veilig, omdat deze niet versleuteld is. @@ -2046,67 +2113,67 @@ We adviseren deze site niet te gebruiken.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL-verbinding</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Waarschuwing over huidige SSL-verbinding:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>met certificaat %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;niet gespecificeerd&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organisatie: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Unit: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Land: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Fingerprint (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Fingerprint (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Ingangsdatum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Vervaldatum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Uitgever: %1</translation> </message> @@ -2114,219 +2181,229 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Succes.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync kon het journal bestand niet maken of lezen. Controleer of u de juiste lees- en schrijfrechten in de lokale syncmap hebt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>CSync kon het journal bestand niet inladen. Het journal bestand is kapot.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>De %1 plugin voor csync kon niet worden geladen.<br/>Verifieer de installatie!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync kreeg een fout tijdens het verwerken van de interne mappenstructuur.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync kon geen geheugen reserveren.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>CSync fatale parameter fout.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSync verwerkingsstap bijwerken mislukt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync verwerkingsstap verzamelen mislukt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync kon niet authenticeren bij de proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync kon geen proxy of server vinden.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync kon niet authenticeren bij de %1 server.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync kon niet verbinden met het netwerk.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Er trad een netwerk time-out op.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Er trad een HTTP transmissiefout plaats.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync mislukt omdat de benodigde toegang werd geweigerd.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync kreeg geen toegang</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync probeerde een al bestaande directory aan te maken.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Geen ruimte op %1 server beschikbaar.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSync ongedefinieerde fout.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Afgebroken door de gebruiker</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>De gemounte map is tijdelijk niet beschikbaar op de server</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Er trad een fout op bij het openen van een map</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Interne fout nummer %1 opgetreden.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Dit onderwerp is niet gesynchroniseerd door eerdere fouten: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symbolic links worden niet ondersteund bij het synchroniseren.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Harde links worden niet ondersteund bij synchronisatie.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Het bestand is opgenomen op de negeerlijst.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Bestand bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Bestandsnaamcodering is niet geldig</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Niet in staat om een synchronisatie transactielog te starten.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Kan het sync transactielog niet openen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Genegeerd vanwege de "wat synchroniseren" zwarte lijst</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Niet toegestaan, omdat u geen rechten hebt om sub-directories aan te maken in die directory</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Niet toegestaan, omdat u geen rechten hebt om een bovenliggende directories toe te voegen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Niet toegestaan, omdat u geen rechten hebt om bestanden in die directory toe te voegen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Niet toegestaan om te verwijderen, herstellen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Lokale bestanden en share-map verwijderd. </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Verplaatsen niet toegestaan, object hersteld</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Verplaatsen niet toegestaan omdat %1 alleen-lezen is</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>bestemming</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>bron</translation> </message> @@ -2334,7 +2411,7 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2342,17 +2419,17 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Versie %1. Voor meer informatie bezoek <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Copyright ownCloud, Incorporated</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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>Gedistribueer door %1 en gelicenseerd onder de GNU General Public License (GPL) Versie 2.0.<br/>%2 en het %2 logo zijn geregistreerde handelsmerken van %1 in de Verenigde Staten, in andere landen of beide.</p></translation> </message> @@ -2457,7 +2534,8 @@ We adviseren deze site niet te gebruiken.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Crash nu</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2503,7 +2581,7 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Versie %2. Bezoek voor meer informatie bezoek <a href="%3">%4</a>.</p><p><small>Door Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz en anderen.</small></p><p>Copyright ownCloud, Inc.</p><p>Gelicenseerd onder de GNU Genertal Public License (GPL) Versie 2.0<br>ownCloud en het ownCloud logo zijn geregistreerde handelsmerken van ownCloud, Inc. in de Verenigde Staten, andere landen, of beide.</p></translation> </message> @@ -2600,7 +2678,7 @@ We adviseren deze site niet te gebruiken.</translation> <translation>Configureer het client-side TLS-certificaat</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>Kon niet verbinden met het opgegeven beveiligde serveradres <em>%1</em>.Hoe wilt u verder gaan?</p></body></html></translation> </message> @@ -2777,12 +2855,12 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Systeemvak niet beschikbaar</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 heeft een werkend systeemvak nodig. Als je XFCE draait volg <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">deze instructies</a>. Anders, installeer een systeemvak applicatie zoals 'trayer' and probeer het opnieuw.</translation> </message> @@ -2790,82 +2868,87 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Gebouwd vanaf Git revisie <a href="%1">%2</a> op %3, %4 gebruik makend van Qt %5.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Gedownload</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Geüpload</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Verwijderd</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Verplaatst naar %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Genegeerd</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Toegangsfout van het bestandssysteem</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Fout</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Onbekend</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>downloaden</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>uploaden</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>verwijderen</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>verplaatsen</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>negerend</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>fout</translation> </message> @@ -2873,52 +2956,52 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Ongedefinieerde status</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>In afwachting van synchronisatie</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Bezig met synchroniseren</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Synchronisatie geslaagd</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <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="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Synchronisatie fout</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Installatiefout</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Voorbereiden synchronisatie</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Aan het afbreken...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Synchronisatie is gepauzeerd</translation> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 5a527e83c..17fb858bc 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -30,27 +30,27 @@ <translation>Formularz</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Wybierz zdalny folder docelowy</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Utwórz katalog</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Odśwież</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Katalogi</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>Etykieta tekstowa</translation> </message> @@ -134,97 +134,97 @@ <translation>Wznów</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Potwierdź usunięcie katalogu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Czy naprawdę chcesz przerwać synchronizację folderu <i>%1</i>?</p><p><b>Uwaga:</b> Ta czynność nie usunie plików z klienta.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Potwierdź reset folderu </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Czy rzeczywiście chcesz zresetować folder <i>%1</i> i przebudować bazę klientów?</p><p><b>Uwaga:</b> Ta funkcja została przewidziana wyłącznie do czynności technicznych. Nie zostaną usunięte żadne pliki, ale może to spowodować znaczący wzrost ruchu sieciowego i potrwać kilka minut lub godzin, w zależności od rozmiaru folderu. Używaj tej opcji wyłącznie, jeśli Twój administrator doradził Ci takie działanie.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Synchronizacja uruchomiona</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Rozpoznaję '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 z %4) %5 pozostało z %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 z %4)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 z %2, plik %3 z %4 Pozostało czasu %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>plik %1 z %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) z %2 przestrzeni na serwerze w użyciu.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Podłączony do <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Podłączony do <a href="%1">%2</a> jako <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Brak połączenia do %1 na <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Połączenie %1 nie skonfigurowane.</translation> </message> @@ -257,12 +257,12 @@ Pozostało czasu %5</translation> <translation>Hasło certyfikatu:</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Wybierz certyfikat:</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Pliki certyfikatu (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Pozostało czasu %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Nie skonfigurowano konta ownCloud</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Konfigurowany serwer dla tego klienta jest za stary</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Proszę zaaktualizować serwer do najnowszej wersji i zrestartować klienta.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Nie mogę połączyć się do %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>wygaśnięcie</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Podane dane logowania są nieprawidłowe</translation> </message> @@ -327,30 +332,38 @@ Pozostało czasu %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Przekroczono czas odpowiedzi</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Nie można utworzyć kontekstu csync</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Folder lokalny %1 nie istnieje.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 powinien być katalogiem, ale nie jest.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 jest nie do odczytu.</translation> </message> @@ -464,62 +477,62 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Nie udało się zresetować stanu folderu</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Niezdefiniowany stan</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Czekają na uruchomienie synchronizacji.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Przygotowuję do synchronizacji</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Synchronizacja w toku</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Ostatnia synchronizacja zakończona powodzeniem.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Błąd ustawień.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Użytkownik anulował.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Synchronizacja wstrzymana</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation> %1 (Synchronizacja jest zatrzymana)</translation> </message> @@ -546,8 +559,8 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Dodaj folder</translation> </message> @@ -555,67 +568,67 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Kliknij, aby wybrać folder lokalny do synchronizacji.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Wpisz ścieżkę do folderu lokalnego.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>Alias katalogu jest nazwą opisową dla tego połączenia synchronizacji.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Nie wybrano poprawnego lokalnego katalogu!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Nie masz uprawnień, aby zapisywać w tym katalogu!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Ścieżka lokalna %1 już istnieje w zdalnym folderze. Proszę wybrać inną!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Folder jest już skonfigurowany w bieżącym wpisie.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Zaznaczony folder jest linkiem symbolicznym. Skonfigurowany folder jest tym, na który wskazuje ten link.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Folder już skonfigurowany zawiera katalogi aktualnie wprowadzone.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Zaznaczony folder jest linkiem symbolicznym. Skonfigurowany już folder jest nadrzędnym w stosunku do folderu na który wskazuje ten link.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Alias nie może być pusty. Proszę wprowadzić alias.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>Alias <i>%1</i> jest już używany. Wprowadź inny alias.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Wybierz katalog źródłowy</translation> </message> @@ -623,42 +636,47 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Dodaj zdalny katalog</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Wpisz nazwę dla nowego katalogu, utworzonego poniżej '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Folder został utworzony pomyślnie na %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Nie udało się utworzyć folderu na %1. Proszę sprawdzić ręcznie.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Wybierz to, aby zsynchronizować całe konto</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Ten katalog jest już synchronizowany.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Synchronizujesz już <i>%1</i>, który jest folderem nadrzędnym <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Już aktualizujesz wszystkie pliku. Synchronizacja innego folderu <b>nie</b> jest wspierana. Jeśli chcesz synchronizować wiele folderów, proszę usuń aktualnie skonfigurowaną synchronizację folderu głównego.</translation> </message> @@ -666,7 +684,7 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Wybierz co synchronizować: Możesz opcjonalnie odznaczyć podkatalogi, których nie chcesz synchronizować.</translation> </message> @@ -674,31 +692,35 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Ostrzeżenie:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Serwer zwrócił błędną zakres zawartości</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Limit czasu połączenia</translation> </message> @@ -755,12 +777,12 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Wprowadź hasło</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Proszę podać hasło %1 dla użytkownika '%2':</translation> </message> @@ -836,8 +858,8 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Szukaj: </translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Nie można zapisać w pliku dziennika</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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>Plik '%1'<br>nie może zostać otwarty do zapisu.<br/><br/>Dane wyjściowe dziennika <b>nie</b> mogą być zapisane!</nobr></translation> </message> @@ -896,7 +918,7 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Przekroczono czas odpowiedzi</translation> </message> @@ -904,27 +926,27 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Nowa wersja dostępna</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Nowa wersja klienta %1 jest dostępna.</p><p><b>%2</b>jest dostępna do pobrania. Zainstalowana wersja to %3.<p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Pomiń tą wersję</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Pomiń tym razem</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Uaktualnij</translation> </message> @@ -1033,54 +1055,53 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Nowe aktualizacje gotowe</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Nowa aktualizacja ma zostać zainstalowana. Instalator może -poprosić o dodatkowe uprawnienia podczas tego procesu.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Pobieranie wersji %1. Proszę czekać...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Wersja %1 jest dostępna. Uruchom ponownie aplikację aby uruchomić aktualizację.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Nie można pobrać aktualizacji. Proszę kliknąć <a href='%1'>tutaj</a>, aby ściągnąć aktualizację ręcznie</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Nie można sprawdzić dostępności nowych aktualizacji.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Nowa wersja %1 jest dostępna. Aby ją zainstalować, użyj systemowego narzędzia do aktualizacji.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Sprawdzanie aktualizacji serwera...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Status aktualizacji nieznany. Nie sprawdzono nowych aktualizacji.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Brak dostępnych aktualizacji. Twoja instalacja jest w najnowszej wersji.</translation> </message> @@ -1108,28 +1129,33 @@ poprosić o dodatkowe uprawnienia podczas tego procesu.</translation> <translation>%1 katalog '%2' jest zsynchronizowany do katalogu lokalnego '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Uwaga:</strong> Masz obecnie skonfigurowane wielokrotne katalogi . Jeśli będziesz kontynuować z obecnymi ustawieniami, konfiguracje katalogów będą odrzucone i pojedyncza synchronizacja głównego katalogu będzie utworzona!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Uwaga:</strong> Lokalny katalog nie jest pusty. Wybierz rozważnie!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Folder lokalnej synchronizacji</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Zaktualizuj zaawansowane ustawienia</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1147,7 +1173,7 @@ poprosić o dodatkowe uprawnienia podczas tego procesu.</translation> <translation>Wprowadź poświadczenia użytkownika</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Zaktualizuj poświadczenia uzytkownika</translation> </message> @@ -1190,129 +1216,139 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Udane połączenie z %1: %2 wersja %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Nie udało się połączyć do %1 w %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Próba połączenia z %1 w %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Tworzenie lokalnego folderu synchronizowanego %1...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>OK</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>Błąd.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <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="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Nie określono folderu zdalnego!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Błąd: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>tworzę folder na ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <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="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <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="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <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="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Udane połączenie z %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <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="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Zmiana nazwy folderu nie powiodła się</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <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> @@ -1351,7 +1387,7 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Limit czasu połączenia</translation> </message> @@ -1359,7 +1395,7 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"/> </message> @@ -1395,17 +1431,17 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -1413,17 +1449,17 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Przywracanie nie powiodło się:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Plik lub katalog został usunięty z udziału z prawem tylko do odczytu, ale przywrócenie nie powiodło się: %1</translation> </message> @@ -1431,12 +1467,12 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Uwaga, możliwa niezgodność związana z wielością liter w %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>nie można utworzyć katalogu %1</translation> </message> @@ -1444,17 +1480,17 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Błąd usuwania '%1': %2; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Nie mogę usunąć katalogu '%1';</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Nie można usunąć %1 z powodu kolizji z lokalną nazwą pliku</translation> </message> @@ -1462,7 +1498,7 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Plik %1 nie może być nazwany %2 z powodu kolizji z lokalną nazwą pliku</translation> </message> @@ -1470,44 +1506,44 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Plik został usunięty z zasobu z prawem tylko do odczytu. Został przywrócony.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Folder ten nie może być zmieniony. Został zmieniony z powrotem do pierwotnej nazwy.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Nie wolno zmieniać nazwy tego folderu. Proszę zmień nazwę z powrotem na Shared.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Przywrócono oryginalny plik</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> @@ -1533,33 +1569,33 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Usunięto plik</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Lokalny plik zmienił się podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Został przywrócony i Twoja edycja jest w pliku konfliktu</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Pliki lokalny został usunięty podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Serwer nie potwierdził ostatniego łańcucha danych. (Nie było żadnego e-tag-u)</translation> </message> @@ -1577,16 +1613,6 @@ Niezalecane jest jego użycie.</translation> <translation>Aktywności synchronizacji</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Czas</translation> @@ -1627,34 +1653,34 @@ Niezalecane jest jego użycie.</translation> <translation>Kopiuj listę aktywności do schowka.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Skopiuj do schowka</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Status synchronizacji został skopiowany do schowka.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Spróbuj połączyć się ponownie z tym samym</translation> </message> @@ -1662,22 +1688,22 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Wybierz co synchronizować</translation> </message> @@ -1685,20 +1711,31 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Wczytuję ...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Nazwa</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Rozmiar</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1708,22 +1745,22 @@ Niezalecane jest jego użycie.</translation> <translation>Ustawienia</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Aktywność</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Ogólne</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Sieć</translation> </message> @@ -1731,27 +1768,27 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Aktywność</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Ogólne</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Sieć</translation> </message> @@ -1764,104 +1801,139 @@ Niezalecane jest jego użycie.</translation> <translation>Udostępnij NewDocument.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Udostępnij informację</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>Etykieta</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Udostępnij link</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Ustaw hasło</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Ustaw datę wygaśnięcia</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Ustaw hasło</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Zabezpieczone hasłem</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Wybierz hasło dla linku publicznego</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Oczekuję na przesyłanie</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Nie można zsynchronizować pliku</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"/> </message> @@ -1882,30 +1954,25 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Uwierzytelnienia</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Wymagana powtórna autoryzacja</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Twoja sesja wygasła. Musisz ponownie się zalogować, aby nadal używać klienta</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"/> @@ -1914,114 +1981,114 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Szczegóły certyfikatu</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Nazwa (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Alternatywna nazwa tematu:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organizacja (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Jednostka organizacyjna (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Województwo </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Kraj:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Numer seryjny:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Wystawca</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Emitent:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Data wydania:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Wygasa:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Odciski palców</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Uwaga:</b> Ten certyfikat został ręcznie zaakceptowany</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (własnoręcznie podpisany)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>o połączenie jest szyfrowane przy użyciu %1 bit %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Informacje Certyfikatu:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>To połączenie NIE jest bezpieczne, ponieważ jest nieszyfrowane. @@ -2042,67 +2109,67 @@ Niezalecane jest jego użycie.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>Połączenie szyfrowane</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Ostrzeżenia dotyczące bieżącego połączenia SSL:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>z certyfikatem %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;nie określono&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organizacja: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Jednostka: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Kraj: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Odcisk (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Odcisk (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Data wejścia w życie: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Data wygaśnięcia: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Wystawca: %1</translation> </message> @@ -2110,219 +2177,229 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Sukces.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync nie powiodło się załadowanie lub utworzenie pliku dziennika. Upewnij się, że masz prawa do odczytu i zapisu do lokalnego katalogu synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Wtyczka %1 do csync nie może być załadowana.<br/>Sprawdź poprawność instalacji!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync napotkał błąd podczas przetwarzania wewnętrznych drzew.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync nie mógł zarezerwować pamięci.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>Krytyczny błąd parametru CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>Aktualizacja procesu przetwarzania CSync nie powiodła się.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>Scalenie w procesie przetwarzania CSync nie powiodło się.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync nie mógł się uwierzytelnić przez proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync nie mógł odnaleźć serwera proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync nie mógł uwierzytelnić się na serwerze %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync nie mógł połączyć się z siecią.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Upłynął limit czasu połączenia.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Wystąpił błąd transmisji HTTP.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync nie obsługiwane, odmowa uprawnień.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>Synchronizacja nieudana z powodu braku dostępu</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync próbował utworzyć katalog, który już istnieje.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Brak dostępnego miejsca na serwerze %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>Nieokreślony błąd CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Anulowane przez użytkownika</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Wystąpił błąd wewnętrzny numer %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Ten element nie jest zsynchronizowane z powodu poprzednich błędów: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Linki symboliczne nie są wspierane przy synchronizacji. </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Linki stałe nie są wspierane podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Plik jest na liście plików ignorowanych.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Plik zawiera nieprawidłowe znaki, które nie mogą być synchronizowane wieloplatformowo.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Nie można zainicjować synchronizacji dziennika.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Nie można otworzyć dziennika synchronizacji</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Nie masz uprawnień do dodawania podkatalogów w tym katalogu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Nie masz uprawnień by dodać katalog nadrzędny</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Nie masz uprawnień by dodać pliki w tym katalogu</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Brak uprawnień by usunąć, przywracanie</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Przenoszenie niedozwolone, obiekt przywrócony</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>docelowy</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>źródło</translation> </message> @@ -2330,7 +2407,7 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2338,17 +2415,17 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 type="unfinished"/> </message> @@ -2453,6 +2530,7 @@ Niezalecane jest jego użycie.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"/> </message> <message> @@ -2499,7 +2577,7 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"/> </message> @@ -2596,7 +2674,7 @@ Niezalecane jest jego użycie.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"/> </message> @@ -2774,12 +2852,12 @@ Kliknij</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Systemowy pasek nie dostępny</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 potrzebuje na pracującej tacce systemu. Jeżeli używasz XFCE, proszę dostosować się <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">do tych instrukcji</a>. Alternatywnie, proszę zainstalować program tacki systemu jak np. 'trayer' i spróbować ponownie.</translation> </message> @@ -2787,82 +2865,87 @@ Kliknij</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Zbudowane z rewizji Git <a href="%1">%2</a> na %3, %4 przy użyciu Qt %5.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Pobrane</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Wysłane</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Usunięte</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Przeniesione do %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Ignorowany</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Błąd dostępu do systemu plików</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Nieznany</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>pobieram</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>przesyłanie</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>usuwam</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>przenoszę</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>ignorowane</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>błąd</translation> </message> @@ -2870,52 +2953,52 @@ Kliknij</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Stan niezdefiniowany</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Trwa oczekiwanie na uruchomienie synchronizacji</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Synchronizacja uruchomiona</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Udana synchronizacja</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <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="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Błąd synchronizacji</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Błąd ustawień</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Przygotowuję do synchronizacji</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Anuluję...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Synchronizacja wstrzymana</translation> </message> diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 032f8435c..78c0e4abd 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -30,27 +30,27 @@ <translation>Formulário</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecione a pasta de destino remota</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Criar Pasta</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Atualizar</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Pastas</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -134,97 +134,97 @@ <translation>Retomar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Confirmar Remover Pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Quer mesmo parar a sincronização da pasta <i>%1</i>?</p><b>Nota:</b> Isto não irá remover os ficheiros no seu cliente.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Confirmar Repor Pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Deseja mesmo repor a pasta <i>%1</i> e reconstruir a base de dados do seu cliente?</p><p><b>Nota:</b> Esta função é desenhada apenas para efeitos de manutenção. Os ficheiros não irão ser removidos, mas este processo pode aumentar o tráfego de dados e demorar alguns minutos ou horas a completar, dependendo do tamanho da pasta. Utilize esta funcionalidade apenas se aconselhado pelo seu administrador.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Sincronização em Execução</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>A operação de sincronização está a ser executada.<br/>Deseja terminar?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Descobrindo '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 de %4) %5 restante, a uma taxa de %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 of %2, ficheiro %3 de %4 Tempo total restante %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>ficheiro %1 de %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) de %2 de espaço do servidor em uso.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <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="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Conetado a <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Conetado a <a href="%1">%2</a> como <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Sem coneção para %1 em <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>%1 sem ligação configurada.</translation> </message> @@ -257,12 +257,12 @@ Tempo total restante %5</translation> <translation>Palavra-passe do certificado :</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Selecionar um certificado</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Ficheiros de certificado (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Tempo total restante %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Não foi configurada nenhuma conta ownCloud</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>O servidor configurado para este cliente é muito antigo</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Por favor actualize para a ultima versão do servidor e reinicie o cliente.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Não foi possível conetar a %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>tempo expirado</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>As credenciais fornecidas não estão correctas</translation> </message> @@ -327,30 +332,38 @@ Tempo total restante %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>A ligação expirou</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Não é possível criar 'csync-context'</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <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="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 devia de ser um directório mas não é</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 não é legível.</translation> </message> @@ -463,62 +476,62 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Não foi possível repor o estado da pasta</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>Não foi possível remover o antigo 'journal sync' '%1'. Por favor certifique-se que nenhuma aplicação o está a utilizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Estado indefinido.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>A aguardar para iniciar a sincronização.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>A preparar para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>A sincronização está em execução.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>A última sincronização foi efetuada com sucesso.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>A última sincronização foi efectuada com sucesso, mas existem avisos sobre alguns ficheiros.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Erro na instalação.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Cancelado pelo utilizador.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>A sincronização está pausada.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (A sincronização está pausada)</translation> </message> @@ -545,8 +558,8 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Adicionar Pasta</translation> </message> @@ -554,67 +567,67 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <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="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Localização da pasta.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>O pseudónimo do directório é um nome descritivo para esta conexão de sincronização.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Pasta local seleccionada inválida!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Não tem permissões de escrina na pasta seleccionada!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>A pasta local %1 já é uma pasta de sincronização. por favor escolha outra!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Uma pasta anteriormente configurada está contida na introdução actual.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>O directório seleccionado é uma hiperligação simbólica. Um directório já configurado está contido no directório para a qual a hiperligação está apontada.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Uma pasta anteriormente configurada está contida nos dados introduzidos.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>A pasta seleccionada é um link simbólico. Uma pasta já configurada está contida na pasta para onde este link está a apontar.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>O pseudónimo não pode estar vazio. Por favor introduza um nome descritivo para o pseudónimo ou alias</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>O descritivo <i>%1</i> já está em uso. Por favor escolha outro.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Selecione a pasta de origem</translation> </message> @@ -622,42 +635,47 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Criar Pasta Remota</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Introduza o nome da nova pasta a criar abaixo '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Pasta criada com sucesso em %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Impossível criar a pasta em %1. Por favor valide manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Escolha para sincronizar a sua conta</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Esta pasta já está a ser sincronizada.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <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 'parente' de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Já está a sincronizar todos os seus ficheiros. Sincronizar outra pasta<b>não</b> é suportado. Se deseja sincronizar múltiplas pastas, por favor altere a configuração da pasta raiz de sincronização.</translation> </message> @@ -665,7 +683,7 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Escolher o que Sincronizar. Opcionalmente, é possível desmarcar sub pastas remotas que você não deseja sincronizar.</translation> </message> @@ -673,31 +691,35 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Atenção:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Nenhum E-Tag recebido do servidor, verifique Proxy / gateway</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Recebemos um e-Tag diferente para resumir. Tentando uma próxima vez.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>O servidor retornou o alcance-conteúdo errado</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>O tempo de ligação expirou</translation> </message> @@ -754,12 +776,12 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Insira a Senha</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Por favor, insira %1 senha para o utilizador '%2':</translation> </message> @@ -835,8 +857,8 @@ Itens verificados também serão removidos se evitarem que um diretório seja re </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Procurar:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -875,19 +897,19 @@ Itens verificados também serão removidos se evitarem que um diretório seja re </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Não foi possível escrever no ficheiro de log</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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 escrita.<br/><br/>O ficheiro de registo <b>not</b> pode ser guardado!</nobr></translation> </message> @@ -895,7 +917,7 @@ Itens verificados também serão removidos se evitarem que um diretório seja re <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>A ligação expirou</translation> </message> @@ -903,27 +925,27 @@ Itens verificados também serão removidos se evitarem que um diretório seja re <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Nova Versão Disponível</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>A nova serão do %1 Cliente está disponivel.</p><p><b>%2</b> está disponível para transferência. A versão instalada é a %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Ignorar esta versão</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Ignorar por agora</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Obter atualização</translation> </message> @@ -1032,53 +1054,53 @@ Itens verificados também serão removidos se evitarem que um diretório seja re <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Nova atualização disponível</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Uma nova atualização vai ser instalada. Durante a atualização podem ser pedidos privilégios de administrador.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>A transferir a versão %1. Por favor aguarde...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Versão %1 disponível. Reinicie a aplicação para iniciar atualização.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Nova actualização. Por favor clique <a href='%1'>aqui</a> para transferir.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Não foi possível verificar por novas actualizações.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Nova versão %1 disponível. Por favor use a ferramenta de atualização do sistema para a instalar.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>A verificar atualizações no servidor...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Estado de actualização é desconhecido: não foi possível procurar novas actualizações.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Sem novas atualizações. Já tem a última versão instalada.</translation> </message> @@ -1106,28 +1128,33 @@ for additional privileges during the process.</source> <translation>%1 pasta '%2' sincronizada para pasta '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Aviso:</strong> Tem várias pastas configuradas. Se prosseguir com as definições actuais, a configuração das pastas será rejeotada e será criada uma pasta raiz de sincronização!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Aviso:</strong> A pasta local não está vazia. Faça a sua escolha!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Pasta local de sincronização</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Actualize definições avançadas</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1145,7 +1172,7 @@ for additional privileges during the process.</source> <translation>Introduza as credencias de utilizador</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Actualize credenciais do utilizador</translation> </message> @@ -1187,129 +1214,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Conectado com sucesso a %1: %2 versão %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Impossível conectar a %1 em %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Expirou ao tentar ligação a %1 em %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>A tentar ligação a %1 em %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 acesso, <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="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>A pasta de sincronização locl %1 já existe, a configurar para sincronizar.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> - <source>Creating local sync folder %1... </source> - <translation>A criar a pasta de sincronização local %1 ... </translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>Falhou.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <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="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Não foi indicada a pasta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <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="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <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="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <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="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <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="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Conectado com sucesso a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <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="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Erro ao renomear a pasta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <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> @@ -1348,7 +1385,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>O tempo de ligação expirou</translation> </message> @@ -1356,7 +1393,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>Resposta JSON inválida do URL poll</translation> </message> @@ -1392,17 +1429,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>O ficheiro %1 não pode ser descarregado devido a conflito com um nome de ficheiro local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Não foi possível transferir o ficheiro na totalidade.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome.</translation> </message> @@ -1410,17 +1447,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Restauração Falhou: </translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Continuar na lista negra:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Um ficheiro ou um directório foi removido de uma partilha apenas de leitura, mas o restauro falhou: %1</translation> </message> @@ -1428,12 +1465,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <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="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>Não foi possível criar a directoria %1</translation> </message> @@ -1441,17 +1478,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Erro ao remover '%1': %2;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Não foi possível remover o directório '%1';</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <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> @@ -1459,7 +1496,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <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> @@ -1467,45 +1504,45 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>O ficheiro havia sido removido de uma partilha apenas de leitura. Ficheiro restaurado. </translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Código HTTP errado devolvido pelo servidor. Esperado 204, mas foi recebido "%1 %2".</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Código HTTP errado devolvido pelo servidor. Esperado 201, mas foi recebido "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Esta pasta não pode ser renomeada. A alterar para nome original.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Esta pasta não pode ser renomeada. Por favor renomeie para o seu nome original: Shared.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>O ficheiro foi renomeado mas faz parte de uma partilha só de leitura. O ficheiro original foi restaurado.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Código HTTP errado devolvido pelo servidor. Esperado 201, mas foi recebido "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1530,33 +1567,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Ficheiro Eliminado</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Ficheiro local alterado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>O ficheiro foi editado localmente mas faz parte de uma prtilha só de leitura. Foi restaurado mas a edição está no ficheiro de conflito.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>URL poll em falta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>O arquivo local foi removido durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>O servidor não reconheceu o último bloco. (Nenhuma e-tag estava presente)</translation> </message> @@ -1574,16 +1611,6 @@ It is not advisable to use it.</source> <translation>Atividade de Sincronização</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Tempo</translation> @@ -1624,22 +1651,22 @@ It is not advisable to use it.</source> <translation>Copiar lista de actividades para a área de transferência.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Copiado para a área de transferência</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>O estado da sincronização foi copiada para a área de transferência.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>Atualmente os ficheiros não são ignorados devido a erros anteriores e não existem transferências em progresso</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>%n ficheiro foi ignorado devido a erros anteriores. @@ -1647,7 +1674,7 @@ It is not advisable to use it.</source> </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n ficheiro foi parcialmente transferido. @@ -1655,7 +1682,7 @@ It is not advisable to use it.</source> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Tente sincronizar estes também.</translation> </message> @@ -1663,22 +1690,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Pastas não selecionadas serão <b>removidas</b> do seu sistema local de ficheiros e não serão sincronizadas neste computador</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Escolher o que Sincronizar: Marque as sub pastas remotas que deseja sincronizar.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Escolher o que Sincronizar: Desmarque as sub pastas remotas que não deseja sincronizar.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Escolher o Que Sincronizar</translation> </message> @@ -1686,20 +1713,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>A carregar...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Nome</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Tamanho</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1709,22 +1747,22 @@ It is not advisable to use it.</source> <translation>Definições</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Atividade</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Geral</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Rede</translation> </message> @@ -1732,27 +1770,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Atividade</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Geral</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Rede</translation> </message> @@ -1765,104 +1803,139 @@ It is not advisable to use it.</source> <translation>Partilhar NovoDocumento.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Partilhar Informação</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>partilhar etiqueta</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>Caminho OwnCloud:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Compartilhar hiperligação</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Definir palavra-passe</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Especificar data de expiração</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Definir palavra-passe</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1 caminho: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>%1 Partilhando</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Protegido com Palavra-passe</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Defina a palavra-passe para a hiperligação pública</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>Código de erro OCS API: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Não há pasta de sincronização configurada.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Não foi possível encontrar para carregar.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>Partilha de directórios externos ainda não funciona.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Um ficheiro sincronizado com o mesmo nome já existe. Esse ficheiro não pode ser registado para sincronização.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>Partilha de directórios externos ainda não funciona.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Esperando para carregar...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Não foi possível registar no espaço de sincronização.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Este ficheiro não pode ser sincronizado.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>Sincronização do ficheiro registado não foi bem sucedida.</translation> </message> @@ -1883,30 +1956,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Autenticação</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Requerido reautenticação</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>A sessão expirou. Precisa reiniciar a sessão para poder continuar usando o cliente.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Partilhar com %1</translation> @@ -1915,114 +1983,114 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Detalhes do Certificado</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Nome Comum (NC):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Nomes alternativos</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organização (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Unidade Organizacional (UO):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Estado/Distrito:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>País:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Serial:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Emissor</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Emissor:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Emitido em:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Expira em:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Impressões digitais</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Nota:</b> Este certificado foi aprovado manualmente</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (auto-assinado)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Esta ligação é encriptada a %1 bit %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Informação do certificado:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Esta ligação NÃO é segura uma vez que não está encriptada. @@ -2043,67 +2111,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>Ligação SSL</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Avisos sobre a Ligação SSL actual:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>com o certificado %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;não especificado&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organização: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Unidade: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Chave(MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Chave(SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Data efectiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Data de Expiração: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Emissor: %1</translation> </message> @@ -2111,219 +2179,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Sucesso</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync falhou no carregamento ou criação do ficheiro jornal. Confirme que tem permissões de escrita e leitura no directório de sincronismo local.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>CSync falhou a carregar o ficheiro do jornal. O ficheiro do jornal está corrupto.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>O plugin %1 para o CSync não foi carregado.<br/>Por favor verifique a instalação!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>Csync obteve um erro enquanto processava as árvores internas.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>O CSync falhou a reservar memória</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>Parametro errado, CSync falhou</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>O passo de processamento do CSyn falhou</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync: Processo de reconciliação falhou.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync: erro ao autenticar-se no servidor proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync: Erro a contactar o proxy ou o servidor.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync: Erro a autenticar no servidor %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync: Erro na conecção à rede</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Houve um erro de timeout de rede.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Ocorreu um erro de transmissão HTTP</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync: Erro devido a permissões de negação não tratadas.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync: falha no acesso</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>O CSync tentou criar uma pasta que já existe.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Não ha espaço disponível no servidor %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSync: erro não especificado</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Cancelado pelo utilizador</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>O directório montado está temporariamente indisponível no servidor</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Ocorreu um erro ao abrir directório</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Ocorreu um erro interno número %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>O item não está sincronizado devido a erros anteriores: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Hiperligações simbólicas não são suportadas em sincronização.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Hard links não são suportados em sincronização.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>O ficheiro está na lista de ficheiros a ignorar.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>O ficheiro contém caracteres inválidos que não podem ser sincronizados pelas várias plataformas.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Codificação de nome de ficheiro não é válida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Impossível inicializar sincronização 'journal'.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <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="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado devido à blacklist de escolha para sincronização</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Não permitido, porque não tem permissão para adicionar sub-directórios ao directório</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Não permitido, porque não tem permissão para adicionar o directório principal</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Não permitido, porque não tem permissão para adicionar ficheiros no directório</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Não é permitido fazer o envio deste ficheiro porque é só de leitura no servidor, restaurando</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Não autorizado para remoção, restaurando</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Ficheiros locais e pasta partilhada removidos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Mover não foi permitido, item restaurado</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Mover não foi autorizado porque %1 é só de leitura</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>o destino</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>a origem</translation> </message> @@ -2331,7 +2409,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2339,17 +2417,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Versão %1. Para mais informações visite <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Copyright ownCloud, Incorporado</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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> @@ -2454,7 +2532,8 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Crash agora</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2500,7 +2579,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Versão %2. Para mais informação visite <a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e outros.</small></p><p>Copyright ownCloud, Inc.</p><p>Licenciado sob a GNU General Public License (GPL) Versão 2.0<br/>ownCloud e o logótipo ownCloud são marcas registadas de ownCloud, Inc. nos Estados Unidos da América, outros países, ou ambos.</p></translation> </message> @@ -2597,7 +2676,7 @@ It is not advisable to use it.</source> <translation>Configurar certificado TLS do lado do cliente</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>Falhou em conectar ao endereço seguro do servidor <em>%1</em>. Como deseja proceder?</p></body></html></translation> </message> @@ -2774,12 +2853,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Barra de sistema indisponível</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 necessita de uma Barra de Tarefas. Se está a utilizar XFCE, por favor siga as seguintes <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">instruções</a>. Caso contrário, por favor instale uma Barra de Tarefas, por exemplo 'trayer', e tente novamente.</translation> </message> @@ -2787,82 +2866,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Construído a partir de revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Descarregado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Carregado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Apagado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Movido para %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Ignorado.</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Erro ao acesso do sistema de ficheiros</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Desconhecido</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>A descarregar</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>A carregar</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>a apagar</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>a mover</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>ignorado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>erro</translation> </message> @@ -2870,52 +2954,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Estado indefinido</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <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="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>A sincronização está a decorrer</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>A sincronização foi efectuada com sucesso</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation>Sincronizado com suceso, alguns ficheiros foram ignorados.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Erro de sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Erro na configuração</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>A preparar para sincronizar</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>A cancelar...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Sincronização em pausa</translation> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 23b4f8d11..b541e1877 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -30,27 +30,27 @@ <translation>Formulário</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecionar uma pasta de destino remota</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Criar uma Pasta</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Atualizar</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Pastas</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -134,97 +134,97 @@ <translation>Resumir</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Confirmar Remoção da Pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Você realmente deseja parar de sincronizar a pasta <i>%1</i>?</p><p><b>Nota:</b> Isso não vai remover os arquivos de seu cliente.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Confirme Reiniciar Pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Você realmente deseja redefinir a pasta <i>%1</i> e reconstruir seu banco de dados de clientes?</p><p><b>Nota:</b> Esta função é usada somente para manutenção. Nenhum arquivo será removido, mas isso pode causar significativo tráfego de dados e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Sincronização Acontecendo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>A operação de sincronização está acontecendo.<br/>Você deseja finaliza-la?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Descobrir '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 de %4) %5 deixando a uma taxa de %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 de %2, arquivo %3 de %4 Total de tempo que falta 5%</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>arquivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) de %2 do espaço em uso no servidor.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Atualmente, não há informações de uso de armazenamento disponível.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Conectado à <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Nenhuma conexão para %1 em <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Nenhuma %1 conexão configurada.</translation> </message> @@ -257,12 +257,12 @@ Total de tempo que falta 5%</translation> <translation>Senha do certificado:</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Selecione um certificado</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Arquivos de certificado (* p12 * .pfx)</translation> </message> @@ -293,33 +293,38 @@ Total de tempo que falta 5%</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Nenhuma conta ownCloud configurada</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>O servidor configurado para este cliente é muito antigo</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Por favor, atualize para o último servidor e reinicie o cliente.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Impossível se conectar a %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>tempo limite</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>As credenciais fornecidas não estão corretas</translation> </message> @@ -327,30 +332,38 @@ Total de tempo que falta 5%</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Conexão expirou</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Não é possível criar csync-context</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <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="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 deveria ser uma pasta, mas não é.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 não pode ser lido.</translation> </message> @@ -464,62 +477,62 @@ Você tem certeza que quer executar esta operação?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Não foi possível redefinir o estado da pasta</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Estado indefinido.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Aguardando o inicio da sincronização.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Preparando para sincronização.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>A sincronização está ocorrendo.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>A última sincronização foi feita com sucesso.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Erro de Configuração.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Usuário Abortou</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Sincronização pausada.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Pausa na Sincronização) </translation> </message> @@ -546,8 +559,8 @@ Você tem certeza que quer executar esta operação?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Adicionar Pasta</translation> </message> @@ -555,67 +568,67 @@ Você tem certeza que quer executar esta operação?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Click para selecionar uma pasta local para sincronização.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Entre com o caminha para a pasta local.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>O apelido da pasta é um nome descritivo para esta conexão de sincronização.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Pasta local selecionada inválida!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Voce não tem permissão para escrita na pasta selecionada!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>O caminho local %1 já é uma pasta de upload. Por favor, escolha outro!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Uma pasta configurada já está contida na entrada atual.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>A pasta selecionada é um link simbólico. Uma pasta já configurada está contida na pasta para onde este link está apontando.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Uma pasta já configurada contém a pasta atualmente inserida.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>A pasta selecionada é um link simbólico. Uma pasta já configurada é a mãe da atual selecionada que contém uma pasta para onde este link está apontando.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>O apelido não pode estar vazio. Por favor, forneça um apelido que seja descritivo.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>O alias <i>%1</ i> já está em uso. Por favor, escolha outro alias.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Selecione a pasta de origem</translation> </message> @@ -623,42 +636,47 @@ Você tem certeza que quer executar esta operação?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Criar uma Pasta Remota</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Entre com o nome da nova pasta a ser criada abaixo '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Pasta foi criada com sucesso em %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Falha ao criar a pasta em %1. Por favor, verifique manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Escolha esta opção para sincronizar a conta inteira</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Esta pasta já está sendo sincronizada.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Você já está sincronizando <i>%1</i>, que é uma pasta mãe de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Você já está sincronizando todos os seus arquivos. Sincronizar outra pasta <b>não</ b> é possível. Se você deseja sincronizar várias pastas, por favor, remova a sincronização configurada atualmente para a pasta raiz.</translation> </message> @@ -666,7 +684,7 @@ Você tem certeza que quer executar esta operação?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Escolha o que Sincronizar: Você pode, opcionalmente, desmarcar subpastas remotas que você não deseja sincronizar.</translation> </message> @@ -674,31 +692,35 @@ Você tem certeza que quer executar esta operação?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Advertênciia:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Recebemos um e-Tag diferente para resumir. Tente uma próxima vez.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>O servidor retornou erro numa série-de-conteúdo</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Conexão Finalizada</translation> </message> @@ -756,12 +778,12 @@ Você tem certeza que quer executar esta operação?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Entrar Senha</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Por favor entrar %1 senha para o usuário '%2':</translation> </message> @@ -836,8 +858,8 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Pesquisar</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Incapaz de gravar no arquivo de log</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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>Arquivo '%1'<br/>não pode ser aberto para escrita.<br/><br/>A saída de log <b>não</b> pode ser salva!</nobr></translation> </message> @@ -896,7 +918,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Conexão expirou</translation> </message> @@ -904,27 +926,27 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Nova Versão Disponínel</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Uma nova versão %1 de Ciente está disponível.</p><p><b>%2</b> está disponível para baixar. A versão instalada é a %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Pule esta versão</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Pular desta vêz</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Atualizar</translation> </message> @@ -1033,53 +1055,53 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Nova Atualização Disponível</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Uma nova atualização está prestes a ser instalada. O atualizador pode pedir por privilégios adicionais durante o processo.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Baixando a versão %1. Por favor aguarde...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Versão %1 disponível. Reiniciar a aplicação para iniciar a atualização.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Não foi possível baixar atualização. Por favor, clique <a href='%1'>aqui</ a> para baixar a atualização manualmente.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Não foi possível verificar a existência de novas atualizações.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Nova versão %1 disponível. Por favor use a ferramenta de atualização do sistema para instalar.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Verificando servidor de atualização...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Status de atualização é desconhecida: Não verifique para novas atualizações.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Não há atualizações disponíveis. Sua instalação é a versão mais recente.</translation> </message> @@ -1107,28 +1129,33 @@ for additional privileges during the process.</source> <translation>%1 Pasta '% 2' está sincronizada com pasta local '% 3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong> Atenção: </strong> Você está atualmente com várias pastas configuradas. Se você continuar com as configurações atuais, as configurações de pasta serão descartadas e uma única sincronizaçãoda pasta raiz será criada! </small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Atenção:</strong> O diretório local não está vazio. Escolha a resolução!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Sincronizar Pasta Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Atualizar configuração avançada</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1146,7 +1173,7 @@ for additional privileges during the process.</source> <translation>Entre com as credenciais do usuário</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Atualizar credenciais do usuário</translation> </message> @@ -1188,129 +1215,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Conectado com sucesso a %1: 2% versão %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Falha ao conectar a %1 em %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>O tempo expirou ao tentar contactar %1 e %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Tentando conectar a %1 em %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Criando pasta local de sincronização %1...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>falhou.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <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="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Nenhuma pasta remota foi especificada!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>criar pasta no ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Pasta remota %1 criada com sucesso.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <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="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <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="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Conectado com sucesso a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <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="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Falha no nome da pasta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <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> @@ -1349,7 +1386,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Conexão Finalizada</translation> </message> @@ -1357,7 +1394,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>Resposta JSON inválida a partir do conjunto de URL</translation> </message> @@ -1393,17 +1430,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>O arquivo %1 não pode ser baixado por causa de um confronto local no nome do arquivo!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>O arquivo não pode ser baixado completamente.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>O arquivo %1 não pode ser salvo por causa de um confronto com um nome de arquivo local!</translation> </message> @@ -1411,17 +1448,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Falha na Restauração:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Continuar lista negra:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Um arquivo ou diretório foi removido de um compartilhamento somente de leitura, mas a restauração falhou: %1</translation> </message> @@ -1429,12 +1466,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Atenção, possível caso de sensibilidade de minúscula/maiúscula, choque com 1%</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>Não foi possível criar diretório %1</translation> </message> @@ -1442,17 +1479,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Erro removendo '%1': %2;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Não foi possível remover o diretório '%1';</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Não foi possível remover %1 por causa de um choque de nomes de arquivos locais</translation> </message> @@ -1460,7 +1497,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>O arquivo %1 não pode ser renomeado para %2 por causa de um choque com nome de arquivo local</translation> </message> @@ -1468,45 +1505,45 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>O arquivo foi removido de um compartilhamento somente de leitura. Ele foi restaurado.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Continuar lista negra: código HTTP errado devolvido pelo servidor. Esperado 204, mas recebidos "%1 %2".</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Código HTTP errado retornado pelo servidor. Esperado 201, mas recebidos "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Esta pasta não pode ser renomeada. Ela será renomeado de volta ao seu nome original.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Esta pasta não pode ser renomeada. Por favor, nomeie-a de volta para Compartilhada.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>O arquivo foi renomeado mas faz parte de compartilhamento só de leitura. O arquivo original foi restaurado.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Código HTTP errado retornado pelo servidor. Esperado 201, mas recebidos "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1531,33 +1568,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Arquivo Removido</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Arquivo local modificado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>Faltando conjunto de URL</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>O arquivo local foi removido durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>O servidor não reconheceu o último bloco. (Nenhuma e-tag estava presente)</translation> </message> @@ -1575,16 +1612,6 @@ It is not advisable to use it.</source> <translation>Atividade de Sincronização</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Tempo</translation> @@ -1625,34 +1652,34 @@ It is not advisable to use it.</source> <translation>Copiar a lista de atividades para a área de transferência.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Copiado para área de transferência</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>O estado de sincronização foi copiado para a área de transferência.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>Atualmente não há arquivos ignorados devido a erros anteriores e nenhum downloads está em andamento.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Tente sincronizar estes novamente.</translation> </message> @@ -1660,22 +1687,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Pastas não marcadas serão <b>removidos</b> de seu sistema de arquivos local e não serão mais sincronizadas com este computador</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Escolha o que Sincronizar: Selecione subpastas remotas que você deseja sincronizar.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Escolha o que Sincronizar: Desmarque subpastas remotas que você não deseja sincronizar.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Escolher o que Sincronizar</translation> </message> @@ -1683,20 +1710,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Carregando...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Nome</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Tamanho</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1706,22 +1744,22 @@ It is not advisable to use it.</source> <translation>Configurações</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Atividade</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Geral</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Rede</translation> </message> @@ -1729,27 +1767,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Atividade</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Geral</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Rede</translation> </message> @@ -1762,104 +1800,139 @@ It is not advisable to use it.</source> <translation>Compartilhar NewDocument.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Compartilhar Informações</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>compartilhar etiqueta</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>Caminho OwnCloud:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Compartilhar link</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Configurar senha</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Definir data de validade</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Configurar senha</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>Caminho %1: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>Compartilhamento %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Protegido por Senha</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Escolha uma senha para o link público</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>Código de erro OCS API: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Não há nenhuma pasta de sincronização configurada.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Não consegue encontrar uma pasta para fazer o envio.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>Compartilhamento de diretórios externos ainda não está funcionando.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Existe um arquivo de sincronia com o mesmo nome. O arquivo não pode ser registrado para sincronizar.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>Compartilhamento de diretórios externos ainda não está funcionando.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Esperando para fazer o envio...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Não foi possível registrar no espaço sincronia.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>O arquivo não pode ser sincronizado.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>Sincronização de arquivos registrados não foi bem sucedida ainda.</translation> </message> @@ -1880,30 +1953,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Autenticar</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Reautenticação necessária</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Sua sessão expirou. É preciso re-login para continuar a usar o cliente.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Compartilhar com %1</translation> @@ -1912,114 +1980,114 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3> Detalhes do Certificado </h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Nome Comum (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Assunto Nomes Alternativos:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organização (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Unidade Organizacional (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Estado/Província</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>País:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Série:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Emissor</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Emissor:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Emitido em:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Expira em:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Impressões Digitais</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b> Nota:</b>Este certificado foi aprovado manualmente</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (auto-assinado)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Esta conexão é criptografada usando %1 bit %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Informações do certificado:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Esta conexão não é segura, uma vez que não é criptografada. @@ -2040,67 +2108,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>Conexão SSL</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Avisos sobre a conexão SSL atual:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>com Certificado %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;não especificado&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organização: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Unidade: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Fingerprint/Identificação (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Fingerprint/Identificação (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Data efetiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Data de Vencimento: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Emissor: %1</translation> </message> @@ -2108,219 +2176,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Sucesso.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>Csync falhou ao carregar ou criar o arquivo jornal. Certifique-se de ter permissão de escrita no diretório de sincronização local.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>CSync não conseguiu carregar o arquivo journal. O arquivo journal está corrompido.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>O plugin %1 para csync não foi carregado.<br/>Por favor verifique a instalação!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>Erro do CSync enquanto processava árvores internas.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync falhou ao reservar memória.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>Erro fatal de parametro do CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>Processamento da atualização do CSync falhou.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>Processamento da conciliação do CSync falhou.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>Csync não conseguiu autenticação no proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync falhou ao localizar o proxy ou servidor.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync falhou ao autenticar no servidor %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync falhou ao conectar à rede.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Ocorreu uma desconexão de rede. </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Houve um erro na transmissão HTTP.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync falhou devido a uma negativa de permissão não resolvida.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>Falha no acesso CSync</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync tentou criar um diretório que já existe.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Sem espaço disponível no servidor %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>Erro não especificado no CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Abortado pelo usuário</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>O diretório montado não está temporariamente disponível no servidor</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Aconteceu um erro ao abrir um diretório</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Ocorreu um erro interno de número %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>O item não está sincronizado devido a erros anteriores: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Linques simbólicos não são suportados em sincronização.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Links físicos não são compatíveis com a sincronização.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>O arquivo está listado na lista de ignorados.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Arquivos que contém caracteres inválidos não podem ser sincronizados através de plataformas. </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>A codificação do nome do arquivo não é válida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Impossibilitado de iniciar a sincronização.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Não é possível abrir o arquivo de sincronização</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado por causa da lista negra "escolher o que sincronizar"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Não permitido porque você não tem permissão de criar sub-pastas nesta pasta</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Não permitido porque você não tem permissão de criar pastas mãe</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Não permitido porque você não tem permissão de adicionar arquivos a esta pasta</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Não é permitido remover, restaurando</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Arquivos locais e pasta compartilhada removida.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Não é permitido mover, item restaurado</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Não é permitido mover porque %1 é somente para leitura</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>o destino</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>a fonte</translation> </message> @@ -2328,7 +2406,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2336,17 +2414,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Versão %1. Para mais informações por favor visite <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Copyright ownCloud, Incorporated</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 sobre a GNU General Public License (GPL) Versão 2.0.<br/>%2 e o %2 logo são marcas registradas de %1 nos Estados Unidos, outros países ou ambos.</p></translation> </message> @@ -2451,7 +2529,8 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Quebrar agora</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2497,7 +2576,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Versão %2. Para mais informações visite<a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e outros.</small></p><p>Copyright ownCloud, Inc.</p><p>Licenciado sob a GNU General Public License (GPL) Versão 2.0<br/>ownCloud e o logotipo ownCloud são marcas registradas da ownCloud, Inc. nos Estados Unidos, outros países, ou ambos.</p></translation> </message> @@ -2594,7 +2673,7 @@ It is not advisable to use it.</source> <translation>Configurar certificado TLS do lado do cliente</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>Falha na conexão com o endereço do servidor seguro <em>%1</em>. Como você deseja prosseguir?</p></body></html></translation> </message> @@ -2771,12 +2850,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Área de notificação não disponível</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 requer uma área de notificação em funcionamento. Se você estiver executando o XFCE, siga <a href="http://docs.xfce.org/xfce/xfce4-panel/systray"> estas instruções</a>. Caso contrário, instale um aplicativo de área de notificação, como o 'trayer' e tente novamente.</translation> </message> @@ -2784,82 +2863,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Compilado da revisão Git <a href="%1">%2</a> on %3, %4 usando Qt %5.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Baixado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Enviado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Excluído</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Movido para %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Ignorado</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Erro ao acesso do sistema de arquivos</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Desconhecido</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>baixando</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>enviando</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>eliminando</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>movendo</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>ignorando</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>erro</translation> </message> @@ -2867,52 +2951,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Status indefinido</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Aguardando para iniciar sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Sincronização em andamento</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Sucesso na Sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <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="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Erro de sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Erro na Configuração</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Preparando para sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Abortando...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <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 4949245cc..179b26272 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -30,27 +30,27 @@ <translation>Форма</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Выберите удалённый каталог назначения</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Создать Каталог</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Обновить</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Каталоги</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -134,97 +134,97 @@ <translation>Продолжить</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Подтвердите удаление каталога</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Вы действительно хотите прекратить синхронизацию папки <i>%1</i>?</p><p><b>Заметка:</b> Это действие не удалит файлы с клиента.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Подтвердить сброс каталога</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Вы действительно хотите сбросить каталог <i>%1</i> и перестроить клиентскую базу данных?</p><p><b>Заметка:</b> Данный функционал предназначен только для технического обслуживания. Файлы не будут удалены, но, в зависимости от размера каталога, операция может занять от нескольких минут до нескольких часов и может вызвать передачу большого объема данных. Используйте данную операцию только по рекомендации администратора.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Синхронизация запущена</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <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="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Ищем '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 / %4) Осталось %5 на скорости %6/сек.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 / %2, файл %3 / %4 Оставшееся время: %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>файл %1 из %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>Используется %1 (%3%) из %2 места на сервере.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>В данный момент информация о заполненности хранилища недоступна.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Соединились с <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Подключён к <a href="%1">%2</a> как <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Нет связи с %1 по адресу <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Нет настроенного подключения %1.</translation> </message> @@ -257,12 +257,12 @@ Total time left %5</source> <translation>Пароль для сертификата :</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Выберите сертификат</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Файлы сертификатов (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Total time left %5</source> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Учётная запись OwnCloud не настроена</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Настроенный сервер слишком стар для этого клиента</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Обновите сервер до последней версии и перезапустите клиент.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Невозможно подключиться к %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>тайм-аут</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Введённые учётные данные не верны</translation> </message> @@ -327,30 +332,38 @@ Total time left %5</source> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Время ожидания соединения превышено</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Невозможно создать контекст csync</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Локальный каталог %1 не существует.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 должен быть каталогом, но не является таковым.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 не может быть прочитан.</translation> </message> @@ -464,62 +477,62 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Невозможно сбросить состояние каталога</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Неопределенное состояние.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Ожидает синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Подготовка к синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Идет синхронизация.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Последняя синхронизация прошла успешно.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Последняя синхронизация прошла успешно, но были предупреждения для некоторых файлов.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Ошибка установки.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Отмена пользователем.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Синхронизация приостановлена.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%! (синхронизация приостановлена)</translation> </message> @@ -546,8 +559,8 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Добавить каталог</translation> </message> @@ -555,67 +568,67 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Кликните, чтобы выбрать локальный каталог для синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Укажите путь к локальному каталогу.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>Псевдоним каталога - это наглядное имя для этой синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Локальный каталог не выбран!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>У вас недостаточно прав для записи в выбранный каталог!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Локальный путь %1 уже загружается на сервер. Пожалуйста, выберите другой!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Для данной записи каталог уже настроен.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Выбранный каталог является симолической ссылкой. В каталоге, на который указывает ссылка, присутствует каталог, который синхронизируется.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Выбранный подкаталог принадлежит уже синхронизируемому каталогу.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Выбранный каталог является символической ссылкой. Ссылка указывает на подкаталог, который принадлежит уже синхронизируемому каталогу.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Поле псевдоним не может быть пустым. Пожалуйста укажите псевдоним.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>Псевдоним <i>%1</i> уже используется. Выберите другой псевдоним.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Выберите исходный каталог</translation> </message> @@ -623,42 +636,47 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Создать Удалённый Каталог</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <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="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Каталог успешно создан на %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Невозможно создать каталог по пути %1. Попробуйте создать его вручную.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Нажмите здесь для синхронизации всей учётной записи</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Этот каталог уже выбран для синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <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="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>В данный момент включена синхронизация всех файлов. Синхронизация другого каталога в этом режиме <b>не</b> поддерживается. Удалите синхронизацию корневого каталога сервера для синхронизации нескольких локальных каталогов.</translation> </message> @@ -666,7 +684,7 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Выберите Что Синхронизировать: Вы можете отменить выбор папок, которые Вы не хотите синхронизировать.</translation> </message> @@ -674,31 +692,35 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Предупреждение:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>E-Tag от сервера не получен, проверьте настройки прокси/шлюза.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Сервер вернул неверный диапазон содержимого</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Время ожидания подключения истекло</translation> </message> @@ -755,12 +777,12 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Введите пароль</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Введите пароль от %1 для пользователя '%2':</translation> </message> @@ -836,8 +858,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Поиск:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Не удается произвести запись в файл журнала</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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> @@ -896,7 +918,7 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Время ожидания соединения превышено</translation> </message> @@ -904,27 +926,27 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Доступна новая версия</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Пропустить эту версию</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Пропустить в этот раз</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Получить обновление</translation> </message> @@ -1033,54 +1055,53 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Новое обновление готово</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Новое обновление в процессе установки. Установщик может запросить -дополнительные права во время обновления.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Загрузка версии %1. Пожалуйста, подождите...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Доступна версия %1. Перезапустите приложение для начала процедуры обновления.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Не удалось загрузить обновление. Для скачивания файлов вручную, нажмите <a href='%1'>здесь</a></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Не удалось проверить наличие новых обновлений.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Доступна новая версия %1. Чтобы её установить, воспользуйтесь инструментом обновления системы.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Проверка наличия обновлений на сервере...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Статус обновления неизвестен: Не удалось проверить наличие обновлений.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Обновлений нет. Установлена последняя версия.</translation> </message> @@ -1108,28 +1129,33 @@ for additional privileges during the process.</source> <translation>%1 каталог '%2' синхронизирован с локальным каталогом '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Предупреждение:</strong> У вас настроено несколько каталогов. Если вы продолжите с текущими настройками, то будет создан один корневой каталог для синхронизации. а параметры каталогов - проигнорированы!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory 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="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Локальный каталог синхронизации</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Обновить дополнительные настройки</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1147,7 +1173,7 @@ for additional privileges during the process.</source> <translation>Ввести учётные данные</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Обновить учётные данные</translation> </message> @@ -1190,129 +1216,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <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="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <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="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Превышено время ожидания соединения к %1 на %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Попытка соединиться с %1 на %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Создается локальный каталог синхронизации %1...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ок</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>не удалось.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>Не удалось создать локальный каталог синхронизации %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Не указан удалённый каталог!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>создание каталога на ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Удалённый каталог %1 успешно создан.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Удалённый каталог %1 уже существует. Подключение к нему для синхронизации.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Создание каталога завершилось с HTTP-ошибкой %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Соединение с %1 установлено успешно!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Не удалось соединиться с %1. Попробуйте снова.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Ошибка переименования каталога</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Локальный каталог синхронизации %1 успешно создан!</b></font></translation> </message> @@ -1351,7 +1387,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Время ожидания подключения истекло</translation> </message> @@ -1359,7 +1395,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>Не правильный JSON ответ на сформированный URL</translation> </message> @@ -1395,17 +1431,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Файл %1 не может быть загружен из-за локального конфликта имен!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Невозможно полностью загрузить файл.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Файл %1 не может быть сохранён из-за локального конфликта имен!</translation> </message> @@ -1413,17 +1449,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Восстановление не удалось:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Продолжить занесение в чёрный список:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Файл или каталог был удалён с общего ресурса только для чтения, но его не удалось восстановить: %1</translation> </message> @@ -1431,12 +1467,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Внимание, возможен конфликт чувствительности к регистру с %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>не удалось создать каталог %1</translation> </message> @@ -1444,17 +1480,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Ошибка при удалении '%1': %2; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Невозможно удалить каталог '%1';</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Не удается удалить %1 из-за локального конфликта имен</translation> </message> @@ -1462,7 +1498,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Файл %1 не может быть переименован в %2 из-за локального конфликта имен</translation> </message> @@ -1470,45 +1506,45 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Файл удалён с удаленного общего ресурса только для чтения. Файл был восстановлен.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Сервер ответил не правильным HTTP кодом. Ожидался 204, но получен "%1 %2".</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Сервер ответил не правильным HTTP кодом. Ожидался 201, но получен "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Этот каталог не должен переименовываться. Ему будет присвоено изначальное имя. </translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Этот каталог не должен переименовываться. Присвойте ему изначальное имя: Shared. </translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Файл переименован на удаленном общем ресурсе только для чтения. Файл был восстановлен.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Сервер ответил не правильным HTTP кодом. Ожидался 201, но получен "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1533,33 +1569,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Файл Перемещён</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Локальный файл изменился в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Измененный файл принадлежит удаленному общему ресурсу только для чтения. Файл был восстановлен, ваши правки доступны в файле конфликтов.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>Не хватает сформированного URL</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Локальный файл был удалён в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Сервер не смог подтвердить последнюю часть данных.(Отсутствовали теги e-tag)</translation> </message> @@ -1577,16 +1613,6 @@ It is not advisable to use it.</source> <translation>Журнал синхронизации</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Время</translation> @@ -1627,22 +1653,22 @@ It is not advisable to use it.</source> <translation>Скопировать журнал синхронизации в буфер обмена.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Скопировано в буфер обмена</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Статус синхронизации скопирован в буфер обмена.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>В настоящий момент из-за предыдущих ошибок ни один из файлов не игнорируется и нет ни одной активной загрузки.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>%n файл пропущен из-за предыдущих ошибок. @@ -1651,7 +1677,7 @@ It is not advisable to use it.</source> </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n файл частично загружен. @@ -1660,7 +1686,7 @@ It is not advisable to use it.</source> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Попробовать синхронизировать позже</translation> </message> @@ -1668,22 +1694,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Не отмеченные каталоги будут <b>удалены</b> из вашей локальной файловой системы и больше не будут синхронизироваться на этом компьютере</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Выберите Что Синхронизировать: Выберите папки на удалённом сервер, которые Вы хотели бы синхронизировать.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Выберите Что Синхронизировать: Снимите выбор папок на удалённом сервере, которые Вы не хотите синхронизировать.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Что синхронизировать</translation> </message> @@ -1691,20 +1717,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Загрузка ...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Имя</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Размер</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1714,22 +1751,22 @@ It is not advisable to use it.</source> <translation>Настройки</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Учётная запись</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>События</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Основные</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Сеть</translation> </message> @@ -1737,27 +1774,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Учётная запись</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>События</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Основные</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Сеть</translation> </message> @@ -1770,104 +1807,139 @@ It is not advisable to use it.</source> <translation>Поделиться NewDocument.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Поделиться Информацией</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>поделиться меткой</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>Путь к OwnCloud:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Поделиться ссылкой</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Установить пароль</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Установите дату истечения</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Установить пароль</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1 путь: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>Вы поделились %1 </translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Защищено Паролем</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Укажите пароль для публичной ссылки</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>Код ошибки OCS API: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Нет папок настроенных для синхронизации.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Не возможно найти папку для загрузки в неё.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>Функция открытия доступа к внешним папкам пока не работает.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Существует файл с именем как и у синхронизируемого. Файл не может быть принят к синхронизации.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>Функция открытия доступа к внешним папкам пока не работает.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Ожидание загрузки...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Не возможно зарегистрироваться в синхронизируемом пространстве.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Файл не может быть синхронизирован.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>Синхронизация зарегистрированного файла пока не была успешной.</translation> </message> @@ -1888,30 +1960,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Авторизация</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Требуется повторная аутентификация</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Срок действия вашей сессии истек. Нужно перезайти, чтобы продолжить пользоваться приложением.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Поделиться с %1</translation> @@ -1920,114 +1987,114 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Детали сертификата</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Общее имя (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Альтернативное имя субъекта:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Организация (О):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Организационное подразделение (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Область/район:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Страна:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Номер:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Издатель</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Издатель:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Выдан:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Истекает:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Отпечаток</ h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Заметка:</b> Этот сертификат был одобрен вручную</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (самоподписанный)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Это соединение зашифровано %1-битным %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Информация сертификата:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Это соединение НЕ безопасно, используется протокол без шифрования. @@ -2048,67 +2115,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL соединение </translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Предупреждения о текущем SSL соединении:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>Сертификат %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;не указано&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Организация: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Подразделение: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Страна: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Отпечаток (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Отпечаток (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Дата вступления в силу: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Дата окончания: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Издатель: %1</translation> </message> @@ -2116,219 +2183,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Успешно.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync не смог открыть или создать файл журнала. Убедитесь, что у вас достаточно прав для чтения и записи в локальном каталоге синхронизации.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>CSync не удалось загрузить файл журнала. Файл журнала повреждён.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Не удается загрузить плагин 1% для csync.<br/>Проверьте установку!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync получил сообщение об ошибке при обработке внутренних деревьев.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync не удалось зарезервировать память.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>Критическая ошибка параметра CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>Процесс обновления CSync не удался.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>Процесс согласования CSync не удался.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync не удалось авторизоваться на прокси сервере.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync не удалось найти прокси сервер.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync не удалось авторизоваться на сервере %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync не удалось подключиться к сети.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Вышло время ожидания подключения к сети.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Произошла ошибка передачи HTTP.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync не работает из-за неожиданного отказа в доступе.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync не имеет доступа</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync пытался создать каталог, который уже существует.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Нет свободного пространства на сервере %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>Неизвестная ошибка CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Прервано пользователем</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>Присоединённая папка временно не доступна на сервере</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Произошла ошибка при открытии папки</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Произошла внутренняя ошибка номер %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Элемент не синхронизируется из-за произошедших ошибок: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Синхронизация символических ссылок не поддерживается.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Синхронизация жёстких ссылок не поддерживаются.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Файл присутствует в списке игнорируемых.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Кодировка имени файла не верна</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Невозможно инициализировать журнал синхронизации.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Не удаётся открыть журнал синхронизации</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Игнорируется из-за черного списка в "что синхронизировать"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Не допускается, так как у вас нет прав для создания подкаталогов в этом каталоге</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Не допускается, так как у вас нет прав для создания родительской папки</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Не допускается, так как у вас нет прав для добавления файлов в этот каталог</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <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/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Не допускается удаление, восстанавливаем</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Локальные файлы и общий каталог удалены.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Перемещение не допускается, элемент восстановлен</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Перемещение не допускается, поскольку %1 помечен только для чтения</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>назначение</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>источник</translation> </message> @@ -2336,7 +2413,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2344,17 +2421,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Версия %1. Для получения дополнительной информации посетите <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Права принадлежат ownCloud, Incorporated</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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> @@ -2459,7 +2536,8 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Критическая ошибка</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2505,7 +2583,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Версия %2. Для более подробной информации посетите <a href="%3">%4</a></p><p><small>Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz и другие.</small></p><p>Права принадлежат ownCloud, Inc.</p><p>Под лицензией GNU General Public License (GPL) Version 2.0<br/>ownCloud и логотип ownCloud являются зарегистрированными товарными знаками ownCloud, Inc. в США и других странах.</p></translation> </message> @@ -2602,7 +2680,7 @@ It is not advisable to use it.</source> <translation>Настроить TLS сертификат клиента</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>Не удалось подключиться к безопасному серверу по адресу <em>%1</em>. Как Вы хотите продолжить?</p></body></html></translation> </message> @@ -2779,12 +2857,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Панель системных значков недоступна</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 требует работающей панели системных значков. Если вы используете XFCE, следуйте <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">этим инструкциям</a>. В противном случае, установите приложение панели системных значков, например, 'trayer', и попробуйте ещё раз.</translation> </message> @@ -2792,82 +2870,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Собрано из исходников Git <a href="%1">%2</a> %3, %4 используя Qt %5.</small><p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Скачано</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Загружено</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Удалено</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Перемещено в %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Проигнорирован</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Ошибка доступа к файловой системе</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Неизвестно</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>скачивание</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>загрузка</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>удаление</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>перемещение</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>игнорирование</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>ошибка</translation> </message> @@ -2875,52 +2958,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Статус не определён</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Ожидание начала синхронизации</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Синхронизация запущена</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Синхронизация прошла успешно</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation>Синхронизация прошла успешно, некоторые файлы были проигнорированы.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Ошибка синхронизации</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Ошибка установки</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Подготовка к синхронизации</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Прерывание...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Синхронизация приостановлена</translation> </message> diff --git a/translations/client_sk.ts b/translations/client_sk.ts index f5ef65ea4..16c5a32c8 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -30,27 +30,27 @@ <translation>Formulár</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Vyberte vzdialený cieľový priečinok</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Vytvoriť priečinok</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Obnoviť</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Priečinky</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -134,97 +134,97 @@ <translation>Obnovenie</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Potvrdiť odstránenie priečinka</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Určite chcete zastaviť synchronizáciu priečinka <i>%1</i>?</p><p><b>Poznámka:</b> Toto neodstráni súbory z vášho klienta.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Potvrdiť zresetovanie priečinka</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Skutočne chcete zresetovať priečinok <i>%1</i> a opätovne zostaviť klientskú databázu?</p><p><b>Poznámka:</b> Táto funkcia je navrhnutá len pre účely údržby. Žiadne súbory nebudú odstránené, ale môže to spôsobiť značnú dátovú prevádzku a vyžiadať si niekoľko minút alebo hodín pre dokončenie, v závislosti od veľkosti priečinka. Použite túto možnosť pokiaľ máte doporučenie od správcu.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Prebiehajúca synchronizácia</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Prehľadávam '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 z %4) %5 zostáva pri rýchlosti %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 of %4)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 z %2, súbor %3 z %4 Celkom zostáva %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>súbor %1 z %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) z %2 miesta na disku je použité. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Teraz nie sú k dispozícii žiadne informácie o využití úložiska.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Pripojené k <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Pripojené k <a href="%1">%2</a> ako <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Žiadne spojenie s %1 na <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Žiadne nakonfigurované %1 spojenie</translation> </message> @@ -257,12 +257,12 @@ Celkom zostáva %5</translation> <translation>Heslo certifikátu:</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Vybrať certifikát</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Súbory certifikátu (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Celkom zostáva %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Žiadny účet v ownCloude nie je nastavený</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Server nakonfigurovaný pre tohto klienta je príliš starý</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Prosím aktualizujte na najnovšiu verziu servera a reštartujte klienta.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Nedá sa pripojiť k %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>vypršal časový limit</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Poskytnuté poverenia nie sú správne</translation> </message> @@ -327,30 +332,38 @@ Celkom zostáva %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Pripojenie expirovalo</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Nemožno vytvoriť "csync-kontext"</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Lokálny priečinok %1 neexistuje.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 by mal byť priečinok, avšak nie je.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 nie je čitateľný.</translation> </message> @@ -464,62 +477,62 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Nemožno resetovať stav priečinka</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Nedefinovaný stav.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Čakanie na štart synchronizácie.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Príprava na synchronizáciu.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Synchronizácia prebieha.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Posledná synchronizácia sa úspešne skončila.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Posledná synchronizácia bola úspešná, ale s varovaniami pre individuálne súbory.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Chyba pri inštalácii.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Zrušené používateľom.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Synchronizácia je pozastavená.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronizácia je pozastavená)</translation> </message> @@ -546,8 +559,8 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Pridať priečinok</translation> </message> @@ -555,67 +568,67 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Kliknutím vyberte lokálny priečinok, ktorý chcete synchronizovať.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Zadajte cestu do lokálneho priečinka.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>Alias priečinka je popisný názov pre toto synchronizačné spojenie.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Nebol vybratý lokálny priečinok!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Nemáte oprávnenia pre zápis do daného priečinka!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Lokálna cesta %1 je už nastavená ako priečinok na odosielanie. Zvoľte prosím iný!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>V aktuálnej položke je už obsiahnutý rovnaký konfigurovaný priečinok.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Zvolený priečinok je symbolický odkaz. Cieľový priečinok tohoto odkazu už obsahuje nastavený priečinok.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>V aktuálnom priečinku je už obsiahnutý tento priečinok.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Zvolený priečinok je symbolický odkaz. Cieľový priečinok tohoto odkazu už obsahuje nastavený priečinok. </translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Alias nesmie byť prázdny. Prosím uveďte názov charakterizujúci alias.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>Alias <i>%1</i> je už použiý. Vyberte si prosím iný alias.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Vyberte zdrojový priečinok</translation> </message> @@ -623,42 +636,47 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Vytvoriť vzdialený priečinok</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Zadajte názov nového priečinka, ktorý bude vytvorený v '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Priečinok bol úspešne vytvorený na %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Na %1 zlyhalo vytvorenie priečinka. Skontrolujte to, prosím, ručne.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Zvoľte pre synchronizáciu celého účtu</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Tento priečinok sa už synchronizuje.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Priečinok <i>%1</i> už synchronizujete a je nadradený priečinku <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Už synchronizujete všetky vaše súbory. Synchronizácia dalšieho priečinka <b>nie je</b> podporovaná. Ak chcete synchronizovať viac priečinkov, odstránte, prosím, synchronizáciu aktuálneho kořenového priečinka.</translation> </message> @@ -666,7 +684,7 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Výber synchronizácie: Môžete dodatočne odobrať vzdialené podpriečinky, ktoré si neželáte synchronizovať.</translation> </message> @@ -674,31 +692,35 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Upozornenie:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Zo servera nebol prijatý E-Tag, skontrolujte proxy/bránu</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Prijali sme iný E-Tag pre pokračovanie. Skúsim to neskôr znovu.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Server vrátil nesprávnu hodnotu Content-range</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Spojenie vypršalo</translation> </message> @@ -755,12 +777,12 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Vložte heslo</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Zadajte prosím %1 heslo pre používateľa '%2': </translation> </message> @@ -836,8 +858,8 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Hľadať:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Nemožno zapísať do záznamového súboru (logu)</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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>Súbor '%1'<br/>nesmie byť otvorený pre proces úprav.</br/><br/>Systémový záznam (log) <b>nemôže</b> byť uložený!</nobr></translation> </message> @@ -896,7 +918,7 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Pripojenie expirovalo</translation> </message> @@ -904,27 +926,27 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Nová verzia je k dispozícii</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Je dostupná nová verzia klienta %1.</p><p><b>%2</b> je dostupná na stiahnutie. Nainštalovaná verzia je %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Preskočiť túto verziu</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Tentoraz preskočiť</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Aktualizovať teraz</translation> </message> @@ -1033,54 +1055,53 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Pripravená je nová aktualizácia</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Nová verzia bude nainštalovaná. Aktualizátor -si počas procesu aktualizácie môže vyžiadať dodatočné práva.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Sťahujem verziu %1. Čakajte prosím...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Verzia %1 je dostupná. Aktualizáciu spustite reštartovaním aplikácie.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Nemôžem stiahnuť aktualizáciu. Kliknite, prosím, na <a href='%1'>tento odkaz</a> pre ručné stiahnutie aktualizácie.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Nemôžem skontrolovať dostupnosť aktualizácie.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Je dostupná nová verzia %1. Prosím, použite nástroj na aktualizáciu systému, aby ste ju nainštalovali.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Kontrolujem aktualizačný server...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Stav aktualizácie nie je známy: Neboli skontrolované nové aktualizácie.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Žiadne aktualizácie nie sú k dispozícii. Používate aktuálnu verziu.</translation> </message> @@ -1108,28 +1129,33 @@ si počas procesu aktualizácie môže vyžiadať dodatočné práva.</translati <translation>%1 priečinok '%2' je zosynchronizovaný do lokálneho priečinka '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Varovanie:</strong> V súčasnosti máte nakonfigurovaných viac priečinkov. Pokiaľ budete pokračovať z danými nastaveniami, konfigurácie priečinkov budú zabudnuté a jednotný koreňový priečinok bude následne vytvorený!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Varovanie:</strong> Lokálny priečinok nie je prázdny. Vyberte riešenie!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Lokálny synchronizačný priečinok</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Aktualizovať pokročilé nastavenie</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1147,7 +1173,7 @@ si počas procesu aktualizácie môže vyžiadať dodatočné práva.</translati <translation>Vložte prihlasovacie údaje</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Aktualizovať prihlasovacie údaje</translation> </message> @@ -1190,129 +1216,139 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Úspešne pripojené k %1: %2 verzie %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Zlyhalo spojenie s %1 o %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Časový limit vypršal pri pokuse o pripojenie k %1 na %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Pokúšam sa o pripojenie k %1 na %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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>Prístup zamietnutý serverom. Po overení správnych prístupových práv, <a href="%1">kliknite sem</a> a otvorte službu v svojom prezerači.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Lokálny synchronizačný priečinok %1 už existuje, prebieha jeho nastavovanie pre synchronizáciu.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> - <source>Creating local sync folder %1... </source> - <translation>Vytváranie lokálneho synchronizačného priečinka %1 ...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>v poriadku</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>neúspešné.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>Nemožno vytvoriť lokálny priečinok %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Vzdialený priečinok nie je nastavený!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>vytváram priečinok v ownCloude: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Vzdialený priečinok %1 bol úspešne vytvorený.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Vzdialený priečinok %1 už existuje. Prebieha jeho pripájanie pre synchronizáciu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Vytváranie priečinka skončilo s HTTP chybovým kódom %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Proces vytvárania vzdialeného priečinka zlyhal, lebo použité prihlasovacie údaje nie sú správne!<br/>Prosím skontrolujte si vaše údaje a skúste to znovu.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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">Vytvorenie vzdialeného priečinka pravdepodobne zlyhalo kvôli nesprávnym prihlasovacím údajom.</font><br/>Prosím choďte späť a skontrolujte ich.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Vytvorenie vzdialeného priečinka %1 zlyhalo s chybou <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Synchronizačné spojenie z %1 do vzdialeného priečinka %2 bolo práve nastavené.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Úspešne pripojené s %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Pripojenie k %1 nemohlo byť iniciované. Prosím skontrolujte to znovu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Premenovanie priečinka zlyhalo</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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>Nemožno odstrániť a zazálohovať priečinok, pretože priečinok alebo súbor je otvorený v inom programe. Prosím zatvorte priečinok nebo súbor a skúste to znovu alebo zrušte akciu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Lokálny synchronizačný priečinok %1 bol úspešne vytvorený!</b></font></translation> </message> @@ -1351,7 +1387,7 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Spojenie vypršalo</translation> </message> @@ -1359,7 +1395,7 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>Neplatná JSON odpoveď z URL adresy</translation> </message> @@ -1395,17 +1431,17 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Súbor sa nedá stiahnuť úplne.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru!</translation> </message> @@ -1413,17 +1449,17 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Obnovenie zlyhalo:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Pokračovať v blacklistingu: </translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Súbor alebo priečinok bol odobratý zo zdieľania len na čítanie, ale jeho obnovenie zlyhalo: %1</translation> </message> @@ -1431,12 +1467,12 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Pozor, možná kolízia z dôvodu veľkosti písmen s %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>nepodarilo sa vytvoriť priečinok %1</translation> </message> @@ -1444,17 +1480,17 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Chyba pri mazaní '%1': %2; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Nemožno odstrániť priečinok '%1'; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Nemožno odstrániť %1 z dôvodu kolízie názvu súboru s lokálnym súborom</translation> </message> @@ -1462,7 +1498,7 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Súbor %1 nemôže byť premenovaný na %2 z dôvodu, že tento názov je už použitý</translation> </message> @@ -1470,45 +1506,45 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Súbor bol odobratý zo zdieľania len na čítanie. Súbor bol obnovený.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Prijatý chybový HTTP kód vrátený serverom. Očakávaný je 204, ale vrátený je "%1 %2".</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Prijatý chybový HTTP kód vrátený serverom. Očakávaný je 201, ale vrátený je "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu pôvodné meno.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu meno Shared.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Súbor bol premenovaný, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Prijatý chybový HTTP kód vrátený serverom. Očakávaný je 201, ale vrátený je "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1533,33 +1569,33 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Súbor zmazaný</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Lokálny súbor bol zmenený počas synchronizácie.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Súbor bol zmenený, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený a upravená verzia je uložená v konfliktnom súbore.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>Chýba URL adresa</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Lokálny súbor bol odstránený počas synchronizácie.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Server nepotvrdil posledný kúsok. (Nebol prítomný e-tag)</translation> </message> @@ -1577,16 +1613,6 @@ Nie je vhodné ju používať.</translation> <translation>Aktivita synchronizácie</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Čas</translation> @@ -1627,22 +1653,22 @@ Nie je vhodné ju používať.</translation> <translation>Skopírovať zoznam aktivít do schránky.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Skopírované do schránky</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Stav synchronizácie bol nakopírovaný do schránky.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>V súčastnosti nie sú na čiernej listine žiadne súbory kvôli predchádzajúcim chybovým stavom a neprebieha žiadne sťahovanie.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>%n súbor je ignorovaný kôli predchádzajúcim chybovým hláseniam. @@ -1651,7 +1677,7 @@ Nie je vhodné ju používať.</translation> </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n súbor je čiastočne stiahnutý. @@ -1660,7 +1686,7 @@ Nie je vhodné ju používať.</translation> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Skúste synchronizovať znova.</translation> </message> @@ -1668,22 +1694,22 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Neoznačené priečinky budú <b>odstránené</b> z lokálneho systému a nebudú už synchronizované na tento počítač</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Výber synchronizácie: Označte vzdialené podpriečinky, ktoré si želáte synchronizovať.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Výber synchronizácie: Odoberte vzdialené podpriečinky, ktoré si neželáte synchronizovať.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Vybrať čo synchronizovať</translation> </message> @@ -1691,20 +1717,31 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Nahrávam...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Názov</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Veľkosť</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1714,22 +1751,22 @@ Nie je vhodné ju používať.</translation> <translation>Nastavenia</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Účet</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Aktivita</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Všeobecné</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Sieť</translation> </message> @@ -1737,27 +1774,27 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Účet</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Aktivita</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Všeobecné</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Sieť</translation> </message> @@ -1770,104 +1807,139 @@ Nie je vhodné ju používať.</translation> <translation>Zdieľať NewDocument.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Zdieľať informácie</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>Štítok</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>zdieľať značku</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>OwnCloud cesta:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Zdieľať linku</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Nastaviť heslo</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Nastaviť dátum expirácie</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Nastaviť heslo</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1 v umiestnení: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>%1 zdieľanie</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Chránené heslom</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Zadajte heslo pre tento verejný odkaz</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>OCS API chybový kód: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Nie je nakonfigurovaný žiadny synchronizačný priečinok.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Nemožno nájsť priečinok na nahrávanie.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>Zdieľanie externých priečinkov ešte nefunguje.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Súbor s rovnakým názvom už existuje. Nemožno ho preto registrovať na synchronizáciu.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>Zdieľanie externých priečinkov ešte nefunguje.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Čakanie na nahrávanie...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Nemožno registrovať v synchronizačnom umiestnení.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Súbor nemožno synchronizovať.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>Synchronizácia registrovaného súboru ešte nebola dokončená.</translation> </message> @@ -1888,30 +1960,25 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - overenie</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Vyžaduje sa opätovné overenie</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Platnosť relácie uplynula. Musíte sa znovu prihlásiť, ak chcete pokračovať v používaní klienta.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Zdieľať s %1</translation> @@ -1920,114 +1987,114 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Podrobnosti certifikátu</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Bežné meno (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Alternatívne meno subjektu:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organizácia (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Organizačná jednotka (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Štát/Provincia:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Krajina:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Sériové číslo:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Vydavateľ</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Vydavateľ:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Vydané:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Platí do:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Odtlačky</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Poznámka:</b> Tento certifikát bol ručne schválený</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (podpísaný sám sebou)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Toto spojenie je šifrované pomocou %1 bitovej šifry %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Informácie o certifikáte:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Toto spojenie NIE JE bezpečné, pretože nie je šifrované. @@ -2048,67 +2115,67 @@ Nie je vhodné ju používať.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>Šifrované (SSL) spojenie</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Varovania ohľadom aktuálneho šifrovaného (SSL) spojenia:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>s certifikátom %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;nešpecifikované&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organizácia: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Jednotka: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Krajina: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Odtlačok (MD5 hash): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Odtlačok (SHA1 hash): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Dátum účinnosti: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Koniec platnosti: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Vydavateľ: %1</translation> </message> @@ -2116,219 +2183,229 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Úspech.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync sa nepodarilo načítať alebo vytvoriť súbor žurnálu. Uistite sa, že máte oprávnenia na čítanie a zápis v lokálnom synchronizovanom priečinku.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>Nepodarilo sa načítanie žurnálovacieho súboru CSync. Súbor je poškodený.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>%1 zásuvný modul pre "CSync" nebolo možné načítať.<br/>Prosím skontrolujte inštaláciu!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>Spracovanie "vnútorných stromov" vrámci "CSync" zlyhalo.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync sa nepodarilo zarezervovať pamäť.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>CSync kritická chyba parametrov.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSync sa nepodarilo spracovať krok aktualizácie.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync sa nepodarilo spracovať krok zladenia.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync sa nemohol prihlásiť k proxy.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync sa nepodarilo nájsť proxy alebo server.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync sa nepodarilo prihlásiť na server %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync sa nepodarilo pripojiť k sieti.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Skončil časový limit sieťového spojenia.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Chyba HTTP prenosu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync zlyhalo. Nedostatočné oprávnenie.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync nepodaril prístup</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync sa pokúsil vytvoriť priečinok, ktorý už existuje.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Na serveri %1 nie je žiadne voľné miesto.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSync nešpecifikovaná chyba.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Zrušené používateľom</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>Pripojený priečinok je na serveri dočasne nedostupný</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Nastala chyba pri otváraní priečinka</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Vyskytla sa vnútorná chyba číslo %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Položka nebola synchronizovaná kvôli predchádzajúcej chybe: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symbolické odkazy nie sú podporované pri synchronizácii.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Pevné odkazy nie sú pri synchronizácii podporované.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Súbor je zapísaný na zozname ignorovaných.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Súbor obsahuje neplatné znaky, ktoré nemôžu byť zosynchronizované medzi platformami.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Kódovanie znakov názvu súboru je neplatné</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Nemôžem inicializovať synchronizačný žurnál.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Nemožno otvoriť sync žurnál</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorované podľa nastavenia "vybrať čo synchronizovať"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto priečinka podpriečinky</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Nie je dovolené, pretože nemáte oprávnenie pridať nadradený priečinok.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto priečinka súbory.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie. Obnovuje sa.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Nie je dovolené odstrániť. Obnovuje sa.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Lokálne súbory a zdieľaný priečinok boli odstránené.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Presunutie nie je dovolené. Položka obnovená.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Presunutie nie je dovolené, pretože %1 je na serveri iba na čítanie</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>cieľ</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>zdroj</translation> </message> @@ -2336,7 +2413,7 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2344,17 +2421,17 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Verzia %1. Pre viac informácií choďte na <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Copyright ownCloud, Incorporated</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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>Šíri %1 pod licenciou GNU General Public License (GPL) Verzia 2.0.<br/>%2 a %2 logo sú registrované známky %1 v USA, ostatných krajinách, alebo oboje.</p></translation> </message> @@ -2459,7 +2536,8 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Zlyhanie</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2505,7 +2583,7 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Verzia %2. Ďalšie informácie získate na adrese <a href="%3">%4</a></p><p><small>Autori Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz a ďalší.</small></p><p>Copyright ownCloud, Inc.</p><p>Licencované za podmienok GNU General Public License (GPL) Version 2.0<br/>ownCloud a ownCloud Logo sú registrované obchodné známky ownCloud, Inc. v USA, ďalších krajinách, alebo oboje.</p></translation> </message> @@ -2602,7 +2680,7 @@ Nie je vhodné ju používať.</translation> <translation>Nakonfigurovať klientský TLS certifikát</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>Nepodarilo sa pripojenie k zabezpečenému serveru <em>%1</em>. Ako chcete pokračovať?</p></body></html></translation> </message> @@ -2779,12 +2857,12 @@ Nie je vhodné ju používať.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Systémová lišta "tray" neprístupná</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 vyžaduje funkčnú systémovú lištu "tray". Pokiaľ používate prostredie XFCE, prosím pokračujte <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">podľa týchto inštrukcií</a>. Inak si prosím nainštalujte aplikáciu systémovej lišty "tray" ako napr. 'trayer' a skúste to znova.</translation> </message> @@ -2792,82 +2870,87 @@ Nie je vhodné ju používať.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Zostavené z Git revízie <a href="%1">%2</a> na %3, %4 pomocou Qt %5.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Stiahnuté</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Odoslané</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Zmazané</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Presunuté do %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Ignorované</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Chyba prístupu k súborovému systému</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Neznámy</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>sťahujem</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>nahrávam</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>vymazávanie</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>presúvanie</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>ignorujem</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>chyba</translation> </message> @@ -2875,52 +2958,52 @@ Nie je vhodné ju používať.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Nedefinovaný status</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Čakanie na začiatok synchronizácie</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Prebieha synchronizácia</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Úspešná synchronizácia</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation>Synchronizácia prebehla úspešne, niektoré súbory boli ignorované.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Chyba synchronizácie</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Chyba inštalácie</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Príprava na synchronizáciu</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Ruším...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Synchronizácia je pozastavená</translation> </message> diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 90a8dccb3..7655975f9 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -30,27 +30,27 @@ <translation>Obrazec</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Izberite oddaljeno ciljno mapo.</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Ustvari mapo</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Osveži</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Mape</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>Oznaka</translation> </message> @@ -134,97 +134,97 @@ <translation>Nadaljuj</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Potrdi odstranitev mape</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Ali res želite zaustaviti usklajevanje mape <i>%1</i>?</p><p><b>Opomba:</b> s tem datoteke iz odjemalca ne bodo odstranjene.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Potrdi ponastavitev mape</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Ali ste prepričani, da želite mapo <i>%1</i> ponastaviti in ponovno izgraditi podatkovno zbirko?</p><p><b>Opozorilo:</b> Možnost je zasnovana za vzdrževanje. Datoteke sicer ne bodo spremenjene, vendar pa je opravilo lahko zelo dolgotrajno in lahko traja tudi več ur. Trajanje je odvisno od velikosti mape. Možnost uporabite le, če vam to svetuje skrbnik sistema.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Usklajevanje je v teku</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Poteka preučevanje %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 od %4) preostaja še %5 pri hitrosti %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 od %4)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 od %2, datoteka %3 od %4 Skupaj še %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>datoteka %1 od %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) od %2 prostora strežnika je v uporabi.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Vzpostavljena je povezava s strežnikom <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Vzpostavljena je povezava z <a href="%1">%2</a> kot <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Ni povezave z %1 pri <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Ni nastavljene povezave %1.</translation> </message> @@ -257,12 +257,12 @@ Skupaj še %5</translation> <translation>Geslo potrdila:</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Izberi potrdilo</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Vrste potrdil (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Skupaj še %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Ni nastavljenega računa v oblaku ownCloud</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Nastavljen strežnik tega odjemalca je prestar.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Posodobite strežnik in ponovno zaženite odjemalca.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Povezava z %1 ni mogoča.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>časovni zamik</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Podana poverila niso pravilna.</translation> </message> @@ -327,30 +332,38 @@ Skupaj še %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Povezava je časovno potekla</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Ni mogoče ustvariti vsebine csync-context</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Krajevna mapa %1 ne obstaja.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 bi morala biti mapa, vendar ni.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 ni mogoče brati.</translation> </message> @@ -464,62 +477,62 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Ni mogoče ponastaviti stanja mape</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, da datoteka ni v uporabi.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Nedoločeno stanje.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>V čakanju na začetek usklajevanja.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Poteka priprava za usklajevanje.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Usklajevanje je v teku.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Zadnje usklajevanje je bilo uspešno končano.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Zadnje usklajevanje je bilo sicer uspešno, vendar z opozorili za posamezne datoteke.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Napaka nastavitve.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Uporabniška prekinitev.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Usklajevanje je začasno v premoru.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (usklajevanje je v premoru)</translation> </message> @@ -546,8 +559,8 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Dodaj mapo</translation> </message> @@ -555,67 +568,67 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Kliknite za izbor krajevne mape za usklajevanje.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Vpišite pot do krajevne mape.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>Oznaka mape je opisno ime za usklajevano povezavo.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Ni izbrane veljavne krajevne mape!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Ni ustreznih dovoljenj za pisanje v izbrano mapo!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Krajevna pot %1 je že mapa za pošiljanje. Izbrati je treba drugo.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Trenutni vnos določa mapo, ki je že nastavljena.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Označena mapa je simbolična povezava. V mapi je povezava do že nastavljene mape s povezavo.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Trenutno vpisana mapa je že usklajena kot podrejena mapa.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Izbrana mapa je simbolna povezava. Naslov povezave je nadrejena mapa trenutno izbrane mape.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Polje oznake ne sme biti prazno.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>Oznaka <i>%1</i> je že v uporabi. Izbrati je treba drugo.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Izbor izvorne mape</translation> </message> @@ -623,42 +636,47 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Ustvari oddaljeno mapo</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Vnesite ime nove mape, ki bo ustvarjena kot podrejena '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Mapa je uspešno ustvarjena na %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Ustvarjanje mape na %1 je spodletelo. Poskusite jo ustvariti ročno.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Izberite možnost za usklajevanje celotnega računa.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Ta mapa je že določena za usklajevanje.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Datoteke se že usklajujejo na ravni mape <i>%1</i>, ki je nadrejena mapi <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Trenutno so v usklajevanju vse datoteke korenske mape. Usklajevanje še ene mape <b>ni</b> podprto. Če želite uskladiti več map, je treba odstraniti trenutno nastavljeno korensko mapo in spremeniti nastavitve.</translation> </message> @@ -666,7 +684,7 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Izbira usklajevanja: Opcijsko lahko določite oddaljene poddirektorije za katere ne želite da se uskladijo.</translation> </message> @@ -674,31 +692,35 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Opozorilo:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Odziv strežnika kaže na neveljaven obseg vsebine</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Povezava je časovno potekla</translation> </message> @@ -755,12 +777,12 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Vnos gesla</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Vpisati je treba geslo %1 za uporabnika '%2':</translation> </message> @@ -836,8 +858,8 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Poišči: </translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>V dnevniško datoteko ni mogoče pisati.</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Napaka</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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>Datoteke '%1'<br/>ni mogoče odpreti za pisanje.<br/><br/>Dnevniškega zapisa <b>ni mogoče</b> shraniti!</nobr></translation> </message> @@ -896,7 +918,7 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Povezava je potekla</translation> </message> @@ -904,27 +926,27 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Na voljo je novejša različica</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>Na voljo je nova različica odjemalca %1.</p><p><b>%2</b> je na voljo za prejem. Trenutno je nameščena različica %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Preskoči to različico</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Posodobitev tokrat preskoči</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Pridobi posodobitve</translation> </message> @@ -1033,54 +1055,53 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Nova posodobitev je pripravljena</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Nameščena bo najnovejša posodobitev. Program lahko -zahteva skrbniška dovoljenja za dokončanje opravila.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Poteka prejemanje različice %1 ...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Na voljo je nova različica %1. Za začetek namestitve je treba program ponovno zagnati.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Ni mogoče prejeti posodobitve. Kliknite <a href='%1'>here</a> za ročni prejem in namestitev.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Ni mogoče preveriti za nove posodobitve.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Na voljo je nova različica %1. Uporabite orodje za namestitev in posodobitev sistema.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Preverjanje strežnika za posodabljanje ...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Stanje posodobitve ni znano: ni mogoče preveriti za nove posodobitve.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Na voljo ni novih posodobitev. Nameščena je najnovejša različica.</translation> </message> @@ -1108,28 +1129,33 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation> <translation>%1 mapa '%2' je usklajena s krajevno mapo '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Opozorilo:</strong> Trenutno je nastavljenih več map. Če kolikor ta nastavitev ne bo popravljena, bo nastavitev prepisana, uporabljena pa bo nastavitev enojne korenske mape za usklajevanje!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Opozorilo:</strong> krajevna mapa ni prazna. Kaj storiti?</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Krajevna mapa usklajevanja</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Posodobi napredne nastavitve</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1147,7 +1173,7 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation> <translation>Vpiši uporabniška poverila</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Posodobi uporabniška poverila</translation> </message> @@ -1190,129 +1216,139 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Uspešno vzpostavljena povezava z %1: %2 različica %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Povezava z %1 pri %2 je spodletela:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Prekinitev med poskusom povezave na %1 pri %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Poteka poskus povezave z %1 na %2 ...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 vašim brskalnikom.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Ustvarjanje mape za krajevno usklajevanje %1... </translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>je v redu</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>je spodletelo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <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="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Ni navedenega oddaljenega strežnika!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Napaka: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>ustvarjanje mape v oblaku ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <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="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <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="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <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="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Povezava z %1 je uspešno vzpostavljena!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <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="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Preimenovanje mape je spodletelo</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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 v z drugim programom. Zaprite mapo/dokument ali prekinite namestitev.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <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> @@ -1351,7 +1387,7 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Povezava časovno pretekla</translation> </message> @@ -1359,7 +1395,7 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"/> </message> @@ -1395,17 +1431,17 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Datoteke ni mogoče v celoti prejeti.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke!</translation> </message> @@ -1413,17 +1449,17 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; obnovitev je spodletela: </translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Datoteka ali mapa je bila odstranjena iz mesta v souporabi, ki je nastavljeno le za branje, obnavljanje pa je spodletelo: %1</translation> </message> @@ -1431,12 +1467,12 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Pozor, mogoče je neskladje v velikosti črk imena %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>ni mogoče ustvariti mape %1</translation> </message> @@ -1444,17 +1480,17 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Napaka odstranjevanja '%1': %2; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Ni mogoče odstraniti mape '%1'; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Ni mogoče odstraniti %1 zaradi neskladja s krajevnim imenom datoteke</translation> </message> @@ -1462,7 +1498,7 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Datoteke %1 ni mogoče preimenovati v %2 zaradi že obstoječe datoteke s tem imenom.</translation> </message> @@ -1470,44 +1506,44 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Datoteka je bila odstranjena iz mesta v souporabi, vendar je uspešno obnovljena.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Te mape ni dovoljeno preimenovati, zato bo samodejno preimenovana v izvorno ime.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Mape ni dovoljeno preimenovati. Preimenujte jo nazaj na privzeto vrednost.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Datoteka je preimenovana, vendar je označena za souporabo le za branje. Obnovljena je izvirna datoteka.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> @@ -1533,33 +1569,33 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Datoteka je odstranjena</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Datoteka je bila krajevno spremenjena, vendar pa je označena za souporabo le za branje. Izvorna datoteka je obnovljena, vaše spremembe pa so zabeležene v datoteki spora.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Krajevna datoteka je bila me usklajevanjem odstranjena.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Strežnik ni prepoznal zadnjega niza besed. (ni določenih e-oznak)</translation> </message> @@ -1577,16 +1613,6 @@ Uporaba ni priporočljiva.</translation> <translation>Dejavnost usklajevanja</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Čas</translation> @@ -1627,34 +1653,34 @@ Uporaba ni priporočljiva.</translation> <translation>Kopiraj seznam opravil v odložišče.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Kopirano v odložišče</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Stanje usklajevanja je kopirano v odložišče.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>Trenutno zaradi predhodnih napak ni prezrta nobena datoteka in ni dejavnih prejemov.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Poskusi s ponovnim usklajevanje.</translation> </message> @@ -1662,22 +1688,22 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Neizbrane mape bodo <b>odstranjene</b> iz krajevnega datotečnega sistema in s tem računalnikom ne bodo več usklajevane!</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Izberi datoteke za usklajevanje</translation> </message> @@ -1685,20 +1711,31 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Nalaganje ...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Ime</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Velikost</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1708,22 +1745,22 @@ Uporaba ni priporočljiva.</translation> <translation>Nastavitve</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Račun</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Dejavnosti</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Splošno</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Omrežje</translation> </message> @@ -1731,27 +1768,27 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Račun</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Dejavnosti</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Splošno</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Omrežje</translation> </message> @@ -1764,104 +1801,139 @@ Uporaba ni priporočljiva.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Podrobnosti souporabe</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>Besedilna oznaka</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>Pot do OwnCloud:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Povezava za souporabo</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="142"/> <source>Set password</source> <translation>Nastavi geslo</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> + <location filename="../src/gui/sharedialog.cpp" line="649"/> + <source>%1 path: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> - <source>%1 path: %2</source> + <location filename="../src/gui/sharedialog.cpp" line="113"/> + <source>%1 Sharing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> - <source>%1 Sharing</source> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Zaščiteno z geslom</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Izberite geslo za javno povezavo</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> - <source>Waiting to upload...</source> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> - <source>Unable to register in sync space.</source> + <location filename="../src/gui/sharedialog.cpp" line="608"/> + <source>Waiting to upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Datoteke ni mogoče uskladiti.</translation> + <location filename="../src/gui/sharedialog.cpp" line="610"/> + <source>Unable to register in sync space.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"/> </message> @@ -1882,30 +1954,25 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Overitev</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Zahtevano je vnovično overjanje istovetnosti</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Seja je potekla. Ponovno se je treba prijaviti in nadaljevati z uporabo odjemalca.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Omogoči souporabo z %1</translation> @@ -1914,114 +1981,114 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Podrobnosti potrdila</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Splošno ime (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Druga imena:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Ustanova (U):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Organizacijska enota (OE):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Okraj:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Država:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Zaporedna številka:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Izdaljatelj</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Izdaljatelj:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Izdano na:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Poteče na:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Prstni odtisi</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Opomba:</b> to potrdilo je bilo ročno odobreno</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (samopodpisano)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Ta povezava je šifrirana z %1 bitnim %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Podrobnosti potrdila:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Ta povezava NI varna, saj ni šifrirana. @@ -2042,67 +2109,67 @@ Uporaba ni priporočljiva.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL povezava</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Opozorila o trenutni povezavi SSL:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>s potrdilom %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;ni podano&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Ustanova: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Enota: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Država: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Prstni odtis (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Prstni odtis (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Začetek veljavnosti: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Datum preteka: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Izdajatelj: %1</translation> </message> @@ -2110,219 +2177,229 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Uspešno končano.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>Nalaganje ali ustvarjanje dnevniške datoteke s CSync je spodletelo. Za to opravilo so zahtevana posebna dovoljenja krajevne mape za usklajevanje.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Vstavka %1 za CSync ni mogoče naložiti.<br/>Preverite namestitev!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>Pri obdelavi notranje drevesne strukture s CSync je prišlo do napake.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>Vpisovanje prostora v pomnilniku za CSync je spodletelo.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>Usodna napaka parametra CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>Korak opravila posodobitve CSync je spodletel.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>Korak opravila poravnave CSync je spodletel.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>Overitev CSync na posredniškem strežniku je spodletela.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>Poizvedba posredniškega strežnika s CSync je spodletela.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>Overitev CSync pri strežniku %1 je spodletela.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>Povezava CSync v omrežje je spodletela.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Omrežna povezava je časovno potekla.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Prišlo je do napake med prenosom HTTP.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>Delovanje CSync je zaradi neustreznih dovoljenj spodletelo.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>Dostop s CSync je spodletel</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>Prišlo je do napake programa CSync zaradi poskusa ustvarjanja mape z že obstoječim imenom.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>Odziv CSync: na strežniku %1 ni razpoložljivega prostora.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>Nedoločena napaka CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Opravilo je bilo prekinjeno s strani uporabnika</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Prišlo je do notranje napake številka %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Predmet ni usklajen zaradi predhodne napake: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Usklajevanje simbolnih povezav ni podprto.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Usklajevanje ne podpira trdih povezav.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Datoteka je na seznamu prezrtih datotek.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Ime datoteke vsebuje neveljavne znake, ki niso podprti na vseh okoljih.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Kodni zapis imena datoteke ni veljaven.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Dnevnika usklajevanja ni mogoče začeti.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Ni mogoče odpreti dnevnika usklajevanja</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Prezrto, ker ni neizbrano za usklajevanje</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Ni ustreznih dovoljenj za dodajanje podmap v izbrano mapo.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Ni ustreznih dovoljenj za dodajanje nadrejene mape.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Ni ustreznih dovoljenj za dodajanje datotek v izbrano mapo.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Ni dovoljeno pošiljati te datoteke, ker ima določena dovoljenja le za branje. Datoteka bo obnovljena na izvorno različico.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Odstranitev ni dovoljena, datoteka bo obnovljena.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Krajevne datoteke in mape v souporabi so odstranjene.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Premikanje ni dovoljeno, datoteka bo obnovljena.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Premikanje ni dovoljeno, ker je nastavljeno določilo %1 le za branje.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>cilj</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>vir</translation> </message> @@ -2330,7 +2407,7 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2338,17 +2415,17 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Različica %1. Za več podrobnosti si oglejte <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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>Programski paket objavlja %1 pod pogoji Splošnega javnega dovoljenja GNU (GNU General Public License - GPL), različice 2.0.<br>%2 in logotip %2 sta blagovni znamki %1 v Združenih državah, drugih državah ali oboje.</p></translation> </message> @@ -2453,6 +2530,7 @@ Uporaba ni priporočljiva.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"/> </message> <message> @@ -2499,7 +2577,7 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"/> </message> @@ -2596,7 +2674,7 @@ Uporaba ni priporočljiva.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"/> </message> @@ -2773,12 +2851,12 @@ Uporaba ni priporočljiva.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Sistemska vrstica ni na voljo</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 zahteva uporabo sistemske obvestilne vrstice. Pri uporabnikih namizja XFCE je treba upoštevati <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">posebne nastavitve</a>. V kolikor to ni mogoče, je treba namestiti katerikoli sistem obveščanja, kot je na primer program 'trayer'.</translation> </message> @@ -2786,82 +2864,87 @@ Uporaba ni priporočljiva.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Zgrajeno s predelavo Git <a href="%1">%2</a> na %3, %4 s podporo Qt %5.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Prejeto</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Poslano</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Izbrisano</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Premaknjeno v %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Prezrto</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Napaka dostopa do datotečnega sistema</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Napaka</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Neznano</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>prejemanje</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>pošiljanje</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>brisanje</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>premikanje</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>Prezrto</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>napaka</translation> </message> @@ -2869,52 +2952,52 @@ Uporaba ni priporočljiva.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Stanje je nedoločeno</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Čakanje začetek usklajevanja</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Usklajevanje v teku</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Usklajevanje je uspešno končano</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <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="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Napaka usklajevanja</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Napaka nastavitve</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Priprava na usklajevanje</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Poteka prekinjanje ...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Usklajevanje je ustavljeno</translation> </message> diff --git a/translations/client_sr.ts b/translations/client_sr.ts index b3a3eb80f..58255527c 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -30,27 +30,27 @@ <translation>Образац</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Изаберите удаљену одредишну фасциклу</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Направи фасциклу</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Освежи</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Фасцикле</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>Текст ознака</translation> </message> @@ -134,97 +134,97 @@ <translation>Настави</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Потврда уклањања фасцикле</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Заиста желите да престанете са синхронизацијом фасцикле <i>%1</i>?</p><p><b>Напомена:</b> Ово неће уклонити фајлове из вашег клијента.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Потврда ресетовања фасцикле</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Заиста желите да ресетујете фасциклу <i>%1</i> и поново изградите базу клијента?</p><p><b>Напомена:</b> Ова функција је намењена за сврху одржавања. Фајлови неће бити уклоњени, али ово може узроковати значајан пренос података и може трајати неколико минута или сати док се заврши, зависно од величине фасцикле. Користите ову опцију само ако вам је тако саветовао администратор.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Синхронизација у току</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <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="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Откривам „%1“</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 од %4) %5 преостало при брзини од %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 од %2, фајл %3 од %4 Укупно преостало %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>фајл %1 од %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) од %2 простора искоришћено.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Тренутно нема доступних података о заузећу складишта.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Повезан на <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Повезан на <a href="%1">%2</a> као <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Нема везе са %1 на <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Нема подешене %1 везе.</translation> </message> @@ -257,12 +257,12 @@ Total time left %5</source> <translation>Лозинка сертификата:</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Изаберите сертификат</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Фајлови сертификата (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Total time left %5</source> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Нема подешеног ОунКлауд налога</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Подешени сервер је сувише стар за ову верзију клијента</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Ажурирајте сервер и поново покрените клијента.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Не могу да се повежем са %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>истек времена</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Дати акредитиви нису исправни</translation> </message> @@ -327,30 +332,38 @@ Total time left %5</source> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Време повезивања истекло</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Не могу да направим „csync“ контекст</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Локална фасцикла %1 не постоји.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 би требало да је директоријум али није.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 није читљив.</translation> </message> @@ -464,62 +477,62 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Не могу да ресетујем стање фасцикле</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Неодређено стање.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Чекам почетак синхронизације.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Припремам синхронизацију.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Синхронизација у току.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Последња синхронизација је била успешна.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Последња синхронизација је била успешна али са упозорењима за поједине фајлове.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Грешка подешавања.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Корисник прекинуо.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Синхронизација је паузирана.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (синхронизација паузирана)</translation> </message> @@ -546,8 +559,8 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Додај фасциклу</translation> </message> @@ -555,67 +568,67 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Клик за избор локалне фасцикле за синхронизацију.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Унесите путању до локалне фасцикле.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>Алијас директоријума је описно име за ову везу синхронизације.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Није изабрана исправна локална фасцикла!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Немате дозволе за упис у изабрану фасциклу!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Локална путања %1 је већ фасцикла отпремања. Изаберите другу!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Већ подешена фасцикла се налази у тренутном уносу.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Изабрана фасцикла је симболичка веза. Већ подешена фасцикла се налази у фасцикли на коју упућује ова веза.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Већ подешена фасцикла садржи тренутно унесену фасциклу.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Изабрана фасцикла је симболичка веза. Већ подешена фасцикла садржи тренутно изабрану фасциклу на коју упућује ова веза.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Алијас не може бити празан. Дајте неки описни назив.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>Алијас <i>%1</i> је већ у употреби. Изаберите неки други.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Изаберите изворну фасциклу</translation> </message> @@ -623,42 +636,47 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Прављење удаљене фасцикле</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <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="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Фасцикла је успешно направљена на %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Нисам успео да направим фасциклу на %1. Проверите ручно.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Ово изаберите да синхронизујете целокупан налог</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Ова фасцикла се већ синхронизује.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <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="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Већ синхронизујете све ваше фајлове. Синхронизација других фасцикли <b>није</b> подржана. Ако желите синхронизацију више фасцикли, уклоните тренутно подешену корену фасциклу.</translation> </message> @@ -666,7 +684,7 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Изаберите шта синхронизујете. Опционо, можете избацити удаљене фасцикле које не желите да синхронизујете.</translation> </message> @@ -674,31 +692,35 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Упозорење:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Ниједна е-етикета није примљена са сервера, проверите Proxy/Gateway</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Добили смо различиту е-етикету за наставак. Покушајте поново касније.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Сервер је вратио погрешан опсег садржаја</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Време за повезивање је истекло</translation> </message> @@ -755,12 +777,12 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Унесите лозинку</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Унесите %1 лозинку за корисника „%2“:</translation> </message> @@ -836,8 +858,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Тражи:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Не могу да упишем фајл записника</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Грешка</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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> @@ -896,7 +918,7 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Време повезивања истекло</translation> </message> @@ -904,27 +926,27 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Нова верзија је доступна</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Прескочи ову верзију</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Прескочи сада</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Ажурирај</translation> </message> @@ -1033,54 +1055,53 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Ново ажурирање је спремно</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Спремна је инсталација новог ажурирања. Током ажурирања -могу бити затражена додатна овлашћења.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Преузимам верзију %1. Сачекајте...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Верзија %1 је доступна. Поново покрените апликацију да почнете ажурирање.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Не могу да преузмем ажурирање. Кликните <a href='%1'>овде</a> да бисте га преузели ручно.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Не могу да проверим нова ажурирања.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Нова верзија %1 је доступна. Употребите системски алат за ажурирање да је инсталирате.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Проверавам сервер ажурирања...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Стање ажурирања је непознато. Нисам проверио нова ажурирања.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Нема доступних ажурирања. Имате последњу верзију.</translation> </message> @@ -1108,28 +1129,33 @@ for additional privileges during the process.</source> <translation>%1 фасцикла „%2“ је сингронизована са локалном „%3“</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Упозорење:</strong> Тренутно имате више конфигурисаних фасцикли. Ако наставите са тренутним поставкама, подешавања фасцикли ће бити одбачена и биће формирана синхронизација за појединачну основну фасциклу!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory 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="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Синхронизација локалне фасцикле</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Освежи напредна подешавања</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1147,7 +1173,7 @@ for additional privileges during the process.</source> <translation>Унесите корисничке акредитиве</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Ажурирај корисничке акредитиве</translation> </message> @@ -1190,129 +1216,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <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="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <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="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Време је истекло у покушају повезивања са %1 на %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Покушавам да се повежем са %1 на %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Правим локалну фасциклу за синхронизацију %1 ...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>у реду</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>неуспешно</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>Не могу да направим локалну фасциклу %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Није наведена удаљена фасцикла!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Грешка: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>правим фасциклу на ОунКлауду: % 1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Удаљена фасцикла %1 је успешно направљена.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Удаљена фасцикла %1 већ постоји. Повезујем се ради синхронизовања.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Креирање фасцикле довело је до ХТТП грешке са кодом %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Успешно повезан са %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Не може се успоставити веза са %1. Проверите поново.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Преименовање није успело</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Локална фасцикла за синхронизовање %1 је успешно креирана!</b></font></translation> </message> @@ -1351,7 +1387,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Веза је истекла</translation> </message> @@ -1359,7 +1395,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>Неисправан ЈСОН одговор са адресе упита</translation> </message> @@ -1395,17 +1431,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Фајл %1 се не може преузети јер се судара са називом локалног фајла!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Фајл није могао бити преузет у потпуности.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Фајл %1 се не може сачувати јер се судара са називом локалног фајла!</translation> </message> @@ -1413,17 +1449,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; рестаурација неуспешна: </translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Настави са коришћењем црне листе:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Датотека или директоријум су уклоњени из дељења које је само за читање, али враћење није успело: %1</translation> </message> @@ -1431,12 +1467,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Пажња! Могуће сударање због величине слова са %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>не могу да направим директоријум %1</translation> </message> @@ -1444,17 +1480,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Грешка при уклањању „%1“: %2;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Не могу да уклоним директоријум „%1“;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Не могу да уклоним %1 због сударања са називом локалног фајла</translation> </message> @@ -1462,7 +1498,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Фајл %1 се не може преименовати у %2 због сударања са називом локалног фајла</translation> </message> @@ -1470,45 +1506,45 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Фајл је уклоњен из дељења које је само за читање. Зато је враћен.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Погрешан ХТТП код враћен са сервера. Очекиван 204, али је добијен "%1 %2".</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Погрешан ХТТП код враћен са сервера. Очекиван 201, али је добијен "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Ова фасцикла се не сме преименовати. Зато је враћен првобитни назив.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Ова фасцикла се не сме преименовати. Молим вас вратите назив у Дељени.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Фајл је био преименован али је део дељења које је само за читање. Оригинални фајл је враћен.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Погрешан ХТТП код враћен са сервера. Очекиван 201, али је добијен "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1533,33 +1569,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Фајл уклоњен</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Локални фајл измењен током синхронизације.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Фајл је измењен локално али је у саставу дељења које је само за читање. Враћен је у претходно стање а измене су у фајлу сукоба.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>Адреса упита недостаје</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Локални фајл је уклоњен током синхронизације.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Сервер није потврдио последње парче. (није било е-ознаке)</translation> </message> @@ -1577,16 +1613,6 @@ It is not advisable to use it.</source> <translation>Активност синхронизације</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Време</translation> @@ -1627,22 +1653,22 @@ It is not advisable to use it.</source> <translation>Копирај активност у клипборд.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Копирано у клипборд</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Стање синхронизације је копирано у клипборд.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>Тренутно се, због претходних грешака, ништа не игнорише и нема преузимања у току.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>%n фајл је игнорисан због претходних грешака. @@ -1651,7 +1677,7 @@ It is not advisable to use it.</source> </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n фајл је делимично преузет. @@ -1660,7 +1686,7 @@ It is not advisable to use it.</source> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Покушајте да их синхронизујете поново.</translation> </message> @@ -1668,22 +1694,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Неозначене фасцикле биће <b>уклоњене</b> из локалног фајл-система и више се неће синхронизовати на овом рачунару</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Изаберите шта синхронизујете. Изаберите удаљене фасцикле које желите да синхронизујете.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Изаберите шта синхронизујете. Избаците удаљене фасцикле које не желите да синхронизујете.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Изаберите шта синхронизовати</translation> </message> @@ -1691,20 +1717,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Учитавам ...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Назив</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Величина</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1714,22 +1751,22 @@ It is not advisable to use it.</source> <translation>Поставке</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Налог</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Активност</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Опште</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Мрежа</translation> </message> @@ -1737,27 +1774,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Налог</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Активност</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Опште</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Мрежа</translation> </message> @@ -1770,104 +1807,139 @@ It is not advisable to use it.</source> <translation>Подели NewDocument.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Подаци дељења</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>Текст ознака</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>ознака дељења</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>ОунКлауд путања:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Веза дељења</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Постави лозинку</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Постави датум истека</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Постави лозинку</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1 путања: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>%1 Дељење</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Заштићено лозинком</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Одредите лозинку за јавну везу</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>OCS API код грешке: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Фасцикла за синхронизацију није подешена.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Не могу да пронађем фасциклу за отпремање.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>Дељење спољних директоријума још увек не ради.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Датотека за синхронизацију под истим именом већ постоји. Датотека не може вити регистрована за синхронизацију.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>Дељење спољних директоријума још увек не ради.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Чекам отпремање...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Није могуће регистровати се у простору за синхронизацију.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Фајл не може бити синхронизован.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>Синхронизација регистроване датотеке још увек није успела.</translation> </message> @@ -1888,30 +1960,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - аутентификација</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Неопходна поновна аутентификација</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Ваша сесија је истекла. Поново се пријавите да бисте наставили да користите клијент.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Подели са %1</translation> @@ -1920,114 +1987,114 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Детаљи сертификата</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Уобичајено име:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Алтернативно име:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Организација:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Организациона јединица:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Покрајина/провинција:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Земља:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Серијски број:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Издавач</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Издавач:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Издат:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Истиче:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Отисци</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Напомена:</b> Овај сертификат је ручно одобрен</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (самопотписан)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Ова веза је шифрована коришћењем %1 бита %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Подаци о сертификату:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Ова веза НИЈЕ безбедна јер није шифрована. @@ -2048,67 +2115,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL веза</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Упозорења о тренутној SSL вези:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>са Сертификатом %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;није наведено&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Организација: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Јединица: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Држава: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Отисак (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Отисак (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Датум ступања: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Истиче : %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Издавач: %1</translation> </message> @@ -2116,219 +2183,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Успешно.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync није успео да креира фајл дневника. Проверите да ли имате дозволе за читање и уписивање у локалном директоријуму за синхронизацију.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>CSync није успео да учита фајл дневника. Фајл дневника је оштећен.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Додатна компонента %1 за csync не може бити учитана.<br/>Проверите инсталацију!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync има грешку при обради интерног стабла.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync није успео да резервише меморију.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>CSync фатална грешка параметара.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSync није успео да ажурира корак процесирања.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync није успео да усклади корак процесирања.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync није могао потврдити идентитет на проксију.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync није успео да потражи прокси или сервер.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync није успео да потврди идентитет на %1 серверу.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync није успео да приступи мрежи.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Истекло је време за мрежно повезивање.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Дошло је до грешке ХТТП преноса.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync није успео због одбијања дозвола којим се не управља.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync није успео да приступи</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync покушао да креира директоријум који већ постоји.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Нема простора на серверу %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSync недефинисана грешка.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Прекинуо корисник</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>Монтирани директоријум тренутно није доступан на серверу</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Грешка при отварању директоријума</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Интерна грешка број %1</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Ставка није синхронизована због ранијих грешака: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Симболичке везе нису подржане за синхронизовање.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Чврсте везе нису подржане за синхронизовање.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Фајл се налази на листи за игнорисање.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Фајл садржи неисправне знакове који се не могу синхронизовати на различитим платформама.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Кодирање назива фајла није исправно</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Није могуће покренути у синхронизацију журнала.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Не могу да отворим журнал синхронизације</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Игнорисано због "Изабери шта синхронизујеш" црне листе</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Није дозвољено зато што немате дозволу да додајете поддиректоријуме у тај директоријум</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Није дозвољено зато што немате дозволу да додајете датотеке у тај директоријум</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Није дозвољено зато што немате дозволу да додајете фајлове у тај директоријум</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <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/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Уклањање није дозвољено, враћам</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Локални фајлови и дељена фасцикла су уклоњени.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Премештање није дозвољено. Ставка је враћена</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Премештање није дозвољено јер %1 је само за читање</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>одредиште</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>извор</translation> </message> @@ -2336,7 +2413,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2344,17 +2421,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Верзија %1. За више информација посетите <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Ауторска права ОунКлауд (ownCloud), корпорација</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 општом јавном лиценцом (GPL) верзија 2.0.<br/>%2 и %2 лого су регистроване марке %1 у САД и осталим земљама.</p></translation> </message> @@ -2459,7 +2536,8 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Падови сада</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2505,7 +2583,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Верзија %2. За више информација посетите <a href="%3">%4</a></p><p><small>Клас Фрајтаг (Klaas Freitag), Данијел Мелкентин (Daniel Molkentin), Жан-Кристоф Боршар (Jan-Christoph Borchardt), Оливије Гофар (Olivier Goffart), Маркус Гец (Markus Götz) и остали.</small></p><p>Ауторска права ownCloud, Inc.</p><p>Лиценцирано под ГНУ Општом јавном лиценцом ОЈЛ (GPL) верзије 2.0<br/>оунКлауд и оунКлауд логотип су регистроване робне марке ownCloud, Inc. у САД, другим земљама, или обоје.</p></translation> </message> @@ -2602,7 +2680,7 @@ It is not advisable to use it.</source> <translation>Подеси клијентски ТЛС сертификат</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>Не могу да се повежем на сигурну адресу сервера <em>%1</em>. Како желите да наставите?</p></body></html></translation> </message> @@ -2779,12 +2857,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Системска касета није доступна</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 захтева системску касету. Ако сте у ИксФЦЕ, испратите <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">ова упутства</a>, или инсталирајте апликацију системске касете и покушајте поново.</translation> </message> @@ -2792,82 +2870,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Створено од ГИТ ревизије <a href="%1">%2</a> на %3, %4 помоћу КуТ %5.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Преузето</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Отпремљено</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Обрисано</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Премештено у %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Игнорисано</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Грешка приступа фајл-систему</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Грешка</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Непознато</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>преузимам</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>отпремам</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>бришем</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>премештам</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>игноришем</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>грешка</translation> </message> @@ -2875,52 +2958,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Неодређено стање</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Чекам почетак синхронизације</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Синхронизација у току</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Успешна синхронизација</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation>Синхронизација успешна. Неки фајлови су игнорисани.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Грешка синхронизације</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Грешка подешавања</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Припремам синхронизацију</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Прекидам...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Синхронизација паузирана</translation> </message> diff --git a/translations/client_sv.ts b/translations/client_sv.ts index acaa8b659..dc9490183 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -30,27 +30,27 @@ <translation>Formulär</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Välj en fjärr målmapp</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Skapa mapp</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Uppdatera</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Mappar</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>Textetikett</translation> </message> @@ -134,97 +134,97 @@ <translation>Återuppta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Bekräfta radering av mapp</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Vill du verkligen stoppa synkroniseringen av mappen <i>%1</i>?</p><p><b>Notera:</b> Detta kommer inte att radera filerna från din klient.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Bekräfta återställning av mapp</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Vill du verkligen nollställa mappen <i>%1</i> och återställa din databas?</p><p><b>Notera:</b> Denna funktion är endast designad för underhållsuppgifter. Inga filer raderas, men kan skapa mycket datatrafik och ta allt från några minuter till flera timmar att slutföra, beroende på storleken på mappen. Använd endast detta alternativ om du har blivit uppmanad av din systemadministratör.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Synkronisering pågår</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>En synkronisering pågår.<br/>Vill du avbryta den?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Söker igenom '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 of %4). Tid kvar enskild fil %5. Hastighet %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 av %2, fil %3 av %4 Total tid kvar %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>fil %1 av %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>%1 (%3%) av %2 server utrymme används.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Just nu finns ingen utrymmes information tillgänglig</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Ansluten till <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Ansluten till <a href="%1">%2</a> as <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Ingen anslutning till %1 vid <a href="%2">%3</a></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Ingen %1 anslutning konfigurerad.</translation> </message> @@ -257,12 +257,12 @@ Total tid kvar %5</translation> <translation>Certifikatlösenord :</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Välj ett certifikat</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Certifikatfiler (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Total tid kvar %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Inget ownCloud konto konfigurerat</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Den konfigurerade servern är för den här klienten är för gammal</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Uppgradera servern och starta sedan om klienten.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Kan ej koppla upp till %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>timeout</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>De angivna uppgifterna stämmer ej</translation> </message> @@ -327,30 +332,38 @@ Total tid kvar %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Tidsgräns för anslutningen överskreds</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Kan inte skapa csync-context</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Den lokala mappen %1 finns inte.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 ska vara en mapp, men är inte det.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 är inte läsbar.</translation> </message> @@ -464,62 +477,62 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Kunde inte återställa mappens skick</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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 gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Okänt tillstånd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Väntar på att starta synkronisering.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Förbereder synkronisering</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Synkronisering pågår.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Senaste synkronisering lyckades.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Senaste synkning lyckades, men det finns varningar för vissa filer!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Inställningsfel.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Användare Avbryt</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Synkronisering är pausad.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synk är stoppad)</translation> </message> @@ -546,8 +559,8 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Lägg till mapp</translation> </message> @@ -555,67 +568,67 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Klicka för att välja en lokal mapp att synka.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Ange sökvägen till den lokala mappen.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>Katalogens alias är ett beskrivande namn för denna synkroniseringsanslutning.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Ingen tillåten lokal mapp vald!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Du har inga skrivrättigheter till den valda mappen!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Den lokala sökvägen %1 är redan en uppladdningsmapp. Välj en annan!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>En redan konfigurerad mapp finns i den aktuella posten.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Den valda mappen är en symbolisk länk. En redan konfigurerad mapp finns i mappen länken pekar på.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>En redan konfigurerad mapp innehåller den angivna mappen.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Den angivna mappen är en symbolisk länk. En redan konfigurerad mapp är förälder till den valda och innehåller mappen länken pekar på.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Alias kan inte vara tomt. Ange ett beskrivande ord för alias.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation><i>%1</i> används redan. Välj ett annat alias.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Välj källmapp</translation> </message> @@ -623,42 +636,47 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Skapa fjärrmapp</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Ange namnet på den nya mappen som skall skapas under '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Mappen skapades på %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Det gick inte att skapa mappen på %1. Kontrollera manuellt.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Välj detta för att synka allt</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Denna mappen synkas redan.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Du synkar redan <i>%1</i>, vilket är övermapp till <i>%2</i></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Du synkroniserar redan alla dina filer. Synkronisering av en annan mapp stöds <b>ej</b>. Om du vill synka flera mappar, ta bort den för tillfället konfigurerade rotmappen från synk.</translation> </message> @@ -666,7 +684,7 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Välj Vad du vill Synka: Du har även möjlighet att avmarkera mappar på servern som du ej vill synkronisera.</translation> </message> @@ -674,31 +692,35 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Varning:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Ingen E-Tag mottogs från servern, kontrollera proxy/gateway</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Vi mottog en helt annan e-tag för att återuppta. Försök igen nästa gång.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Servern returnerade felaktig content-range</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Anslutningen avbröts på grund av timeout</translation> </message> @@ -755,12 +777,12 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Ange lösenord</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Vänligen ange %1 lösenord för användare '%2':</translation> </message> @@ -836,8 +858,8 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Sök: </translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Kunde inte skriva till loggfilen</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Fel</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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>Filen '%1'<br/>kan inte öppnas för skrivning.<br/><br/>Loggtexten kan <b>inte</b> sparas!</nobr></translation> </message> @@ -896,7 +918,7 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Tidsgräns för anslutningen överskreds</translation> </message> @@ -904,27 +926,27 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Ny version tillgänglig</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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>En ny version av %1 klienten är tillgänglig.</p><p><b>%2</b> är tillgänglig för nedladdning. Den installerade versionen är %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Hoppa över denna version</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Hoppa över denna gång</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Hämta uppdatering</translation> </message> @@ -1033,54 +1055,53 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>En ny uppdatering är redo</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>En ny uppdatering är på väg att installeras. Uppdateraren kan komma att fråga -efter ytterligare privilegier under processen.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Laddar ner version %1. Var god vänta...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Version %1 tillgänglig. Starta om applikationen för att start uppdateringen.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Kunde inte ladda ner uppdateringen. Klicka <a href='%1'>här</a> för att ladda ner uppdateringen manuellt.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Kunde inte söka efter uppdateringar.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Ny version %1 är tillgänglig. Vänligen använd systemets uppdateringverktyg för att installera den.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Kontrollerar uppdateringsservern...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Uppdateringsstatus är okänd: Gjorde ingen kontroll av nya uppdateringar.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Inga uppdateringar tillgängliga. Din installation är redan den senaste versionen.</translation> </message> @@ -1108,28 +1129,33 @@ efter ytterligare privilegier under processen.</translation> <translation>%1 mappen '%2' är synkroniserad mot den lokala mappen '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Varning:</strong> Du har för närvarande flera mappar konfigurerade. Om du fortsätter med nuvarande inställningar så kommer inställningarna för synkronisering av mapparna att tas bort och ersättas med en enda synkronisering av själva rot-mappen!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Varning:</strong> Den lokala mappen är inte tom. Välj en lösning!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Lokal mapp för synkning</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Uppdatera avancerade inställningar</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1147,7 +1173,7 @@ efter ytterligare privilegier under processen.</translation> <translation>Ange inloggningsuppgifter</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Uppdatera inloggningsuppgifter</translation> </message> @@ -1190,129 +1216,139 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Lyckades ansluta till %1: %2 version %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Misslyckades att ansluta till %1 vid %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Försöker ansluta till %1 på %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Skapar lokal synkmapp %1... </translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>misslyckades.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <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="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Ingen fjärrmapp specificerad! </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Fel: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>skapar mapp på ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Fjärrmapp %1 har skapats.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <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="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <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="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Ansluten till %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <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="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Omdöpning av mapp misslyckades</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <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> @@ -1351,7 +1387,7 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Anslutningen avbröts på grund av timeout</translation> </message> @@ -1359,7 +1395,7 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"/> </message> @@ -1395,17 +1431,17 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Fil %1 kan inte laddas ner på grund av namnkonflikt med en lokal fil!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Filen kunde inte laddas ner fullständigt.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil!</translation> </message> @@ -1413,17 +1449,17 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Restaurering Misslyckades:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Fortsätt svartlista:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>En fil eller katalog togs bort från en endast-läsbar delning, men återställning misslyckades: %1</translation> </message> @@ -1431,12 +1467,12 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Observera, eventuell skiftlägeskänslig konflikt med %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>kunde ej skapa katalogen %1</translation> </message> @@ -1444,17 +1480,17 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Fel vid borttagning av '%1': %2; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Kunde inte ta bort katalog '%1'; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Det gick inte att ta bort %1 på grund av ett lokalt filnamn</translation> </message> @@ -1462,7 +1498,7 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Filen %1 kan inte döpas om till %2 på grund av ett lokalt filnamn</translation> </message> @@ -1470,44 +1506,44 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Den här filen har tagits bort från en endast-läsbar delning. Den återställdes.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Fel HTTP-kod returnerades av servern. Förväntade 204, men tog emot "%1 %2".</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Denna mapp får inte byta namn. Den kommer att döpas om till sitt ursprungliga namn.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Denna mapp får ej döpas om. Vänligen döp den till Delad igen.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>En fil döptes om men är en del av en endast-läsbar delning. Original filen återställdes.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> @@ -1533,33 +1569,33 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Filen Raderad</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Lokal fil ändrades under synk.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Filen ändrades lokalt men är en del av en endast-läsbar delning. Den återställdes och din editering är i konflikt filen.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Den lokala filen togs bort under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Servern bekräftade inte det sista fil-fragmentet (Ingen e-tag fanns tillgänglig)</translation> </message> @@ -1577,16 +1613,6 @@ Det är inte lämpligt använda den.</translation> <translation>Synk aktivitet</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Tid</translation> @@ -1627,34 +1653,34 @@ Det är inte lämpligt använda den.</translation> <translation>Kopiera aktivitetslistan till urklipp.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Kopierat till urklipp</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Synkroniseringsstatus har kopierats till urklipp.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>För närvarande är inga filer ignorerade på grund av föregående fel och inga nerladdningar pågår.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Försök att synkronisera dessa igen.</translation> </message> @@ -1662,22 +1688,22 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>De mappar som inte väljs kommer att <b>raderas</b> från det lokala filsystemet och kommer inte att synkroniseras till den här datorn längre.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Välj vad som ska synkas</translation> </message> @@ -1685,20 +1711,31 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Laddar ...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Namn</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Storlek</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1708,22 +1745,22 @@ Det är inte lämpligt använda den.</translation> <translation>Inställningar</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Aktivitet</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Allmänt</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Nätverk</translation> </message> @@ -1731,27 +1768,27 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Aktivitet</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Allmänt</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Nätverk</translation> </message> @@ -1764,104 +1801,139 @@ Det är inte lämpligt använda den.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>Textetikett</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Dela länk</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Ange lösenord</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Sätt utgångsdatum</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Ange lösenord</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Lösenordsskyddad</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Välj ett lösenord för den publika länken</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> - <source>Waiting to upload...</source> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> - <source>Unable to register in sync space.</source> + <location filename="../src/gui/sharedialog.cpp" line="608"/> + <source>Waiting to upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Filen kan inte synkas.</translation> + <location filename="../src/gui/sharedialog.cpp" line="610"/> + <source>Unable to register in sync space.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"/> </message> @@ -1882,30 +1954,25 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Autentisera</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Autentisering krävs</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Din session har gått ut. Du måste logga in på nytt för att kunna fortsätta använda klienten.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Dela med %1</translation> @@ -1914,114 +1981,114 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Certifikatdetaljer</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Common Name (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Alternativnamn:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Organisation (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Organisationsenhet (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Stat/Provins:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Land:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Serienummer:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Utfärdare</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Utfärdare:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Utfärdat den:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Upphör den:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Fingeravtryck</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Notera:</b> Detta certifikat var manuellt godkänt.</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (självsignerat certifikat)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Denna anslutningen är krypterad med %1 bit %2 </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Certifikatinformation:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Denna anslutningen är INTE säker eftersom den inte är krypterad. @@ -2042,67 +2109,67 @@ Det är inte lämpligt använda den.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL-anslutning</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Varningar angående aktuell SSL-anslutning:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>med Certifikat %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;inte angivet&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Organisation: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Enhet: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Land: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Fingeravtryck (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Fingeravtryck (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Giltigt datum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Utgångsdatum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Utfärdare: %1</translation> </message> @@ -2110,219 +2177,229 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Lyckades.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync misslyckades att skapa en journal fil. Se till att du har läs och skriv rättigheter i den lokala synk katalogen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Plugin %1 för csync kunde inte laddas.<br/>Var god verifiera installationen!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSYNC fel vid intern bearbetning.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync misslyckades att reservera minne.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>CSync fatal parameter fel.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSync processteg update misslyckades.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync processteg reconcile misslyckades.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync kunde inte autentisera mot proxy. </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync misslyckades att hitta proxy eller server.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync misslyckades att autentisera mot %1 servern.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync misslyckades att ansluta mot nätverket.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>En timeout på nätverksanslutningen har inträffat.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Ett HTTP överföringsfel inträffade.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSYNC misslyckades på grund av att nekad åtkomst inte hanterades.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSynk misslyckades att tillträda</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync försökte skapa en mapp som redan finns.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: Ingen plats på %1 server tillgänglig.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSync ospecificerat fel.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Avbruten av användare</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Ett internt fel hände. nummer %1</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Objektet kunde inte synkas på grund av tidigare fel: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symboliska länkar stöds ej i synkningen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Hårda länkar stöds ej vid synkronisering.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Filen är listad i ignorerings listan.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Filen innehåller ogiltiga tecken som inte kan synkas oberoende av plattform.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Filnamnskodning är inte giltig</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Kan inte initialisera en synk journal. </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Kunde inte öppna synk journalen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorerad eftersom den är svartlistad i "välj vad som ska synkas" </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Går ej att genomföra då du saknar rättigheter att lägga till underkataloger i den katalogen </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Går ej att genomföra då du saknar rättigheter att lägga till någon moderkatalog</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Går ej att genomföra då du saknar rättigheter att lägga till filer i den katalogen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Inte behörig att radera, återställer</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Lokala filer och mappar som är delade är borttagna.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Det gick inte att genomföra flytten, objektet återställs</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Det gick inte att genomföra flytten då %1 är skrivskyddad</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>destinationen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>källan</translation> </message> @@ -2330,7 +2407,7 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2338,17 +2415,17 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Version %1. För mer information vänligen besök <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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>Distribueras av %1 och licenserad under GNU General Public License (GPL) Version 2.0.<br/>%2 och %2 logotyp är registrerade varumärken av %1 i Förenta Staterna, andra länder, eller både och.</p></translation> </message> @@ -2453,6 +2530,7 @@ Det är inte lämpligt använda den.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"/> </message> <message> @@ -2499,7 +2577,7 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"/> </message> @@ -2596,7 +2674,7 @@ Det är inte lämpligt använda den.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"/> </message> @@ -2773,12 +2851,12 @@ Det är inte lämpligt använda den.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Systemfältet är inte tillgängligt</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 krävs på ett fungerande systemfält. Om du kör XFCE, vänligen följ <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">dessa instruktioner</a>. Annars, vänligen installera ett systemfälts-program som 'trayer' och försök igen.</translation> </message> @@ -2786,82 +2864,87 @@ Det är inte lämpligt använda den.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Byggd på Git revision <a href="%1">%2</a> på %3, %4 med användning utav Qt %5.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Nedladdats</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Uppladdad</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Raderad</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Flyttad till %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Ignorerad</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Åtkomstfel till filsystemet</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Fel</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Okänt</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>laddar ner</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>laddar upp</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>raderar</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>flyttar</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>ignorerar</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>fel</translation> </message> @@ -2869,52 +2952,52 @@ Det är inte lämpligt använda den.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Odefinierad status</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Väntar på att starta synkronisering</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Synkronisering är aktiv</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Lyckad synkronisering</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <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="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Synkfel</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Inställningsfel</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Förbereder synkronisering</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Avbryter</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Synk är pausad</translation> </message> diff --git a/translations/client_th.ts b/translations/client_th.ts index 8327030be..5e643593b 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -30,27 +30,27 @@ <translation>แบบฟอร์ม</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>รีเฟรช</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>แฟ้มเอกสาร</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>ป้ายข้อความ</translation> </message> @@ -134,96 +134,96 @@ <translation>ดำเนินการต่อ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>ยืนยันการลบโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>การซิงค์ข้อมูลกำลังทำงาน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <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="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation> </message> @@ -256,12 +256,12 @@ Total time left %5</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation type="unfinished"/> </message> @@ -292,33 +292,38 @@ Total time left %5</source> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation type="unfinished"/> </message> @@ -326,30 +331,38 @@ Total time left %5</source> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>โฟลเดอร์ในเครื่อง %1 ไม่มีอยู่</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 ควรเป็นไดเร็กทอรี่แต่ไม่ได้เป็น</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation> </message> @@ -461,62 +474,62 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>รอการเริ่มต้นซิงค์ข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>กำลังเตรียมการเชื่อมข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>การซิงค์ข้อมูลกำลังทำงาน</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>เกิดข้อผิดพลาดในการติดตั้ง</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>การซิงค์ข้อมูลถูกหยุดไว้ชั่วคราว</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -543,8 +556,8 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>เพิ่มโฟลเดอร์</translation> </message> @@ -552,67 +565,67 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>โฟลเดอร์ที่ถูกกำหนดค่าไว้แล้วได้บรรจุรายการปัจจุบันอยู่</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>นามแฝงไม่สามารถเว้นว่างได้ กรุณาใส่คำที่ต้องการใช้เป็นนามแฝง</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>เลือกโฟลเดอร์ต้นฉบับ</translation> </message> @@ -620,42 +633,47 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>โฟลเดอร์ถูกสร้างขึ้นเรียบร้อยแล้วเมื่อ %1...</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation type="unfinished"/> </message> @@ -663,7 +681,7 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> @@ -671,31 +689,35 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation type="unfinished"/> </message> @@ -752,12 +774,12 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation type="unfinished"/> </message> @@ -831,8 +853,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&ค้นหา</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -871,19 +893,19 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>ไม่สามารถเขียนข้อมูลไปไว้ที่ log ไฟล์ได้</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>ข้อผิดพลาด</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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> @@ -891,7 +913,7 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation type="unfinished"/> </message> @@ -899,27 +921,27 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation type="unfinished"/> </message> @@ -1028,53 +1050,53 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation type="unfinished"/> </message> @@ -1102,28 +1124,33 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation type="unfinished"/> </message> @@ -1141,7 +1168,7 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation type="unfinished"/> </message> @@ -1183,129 +1210,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <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="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>กำลังพยายามเชื่อมต่อไปที่ %1 ที่ %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>กำลังสร้างโฟลเดอร์สำหรับโอนถ่ายข้อมูลภายในเครื่อง %1 ...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ตกลง</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>ล้มเหลว</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>ข้อผิดพลาด: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>กำลังสร้างโฟลเดอร์ใหม่บน ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>โฟลเดอร์ระยะไกล %1 ถูกสร้างเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>โฟลเดอร์ระยะไกล %1 มีอยู่แล้ว กำลังเชื่อมต่อเพื่อถ่ายโอนข้อมูล</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <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="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>เชื่อมต่อไปที่ %1! สำเร็จ</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>การเชื่อมต่อกับ %1 ไม่สามารถดำเนินการได้ กรุณาตรวจสอบอีกครั้ง</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>โฟลเดอร์ภายในเครื่องสำหรับผสานข้อมูล %1 ได้ถูกสร้างขึ้นเรียบร้อยแล้ว!</b></font></translation> </message> @@ -1344,7 +1381,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation type="unfinished"/> </message> @@ -1352,7 +1389,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"/> </message> @@ -1388,17 +1425,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -1406,17 +1443,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -1424,12 +1461,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1437,17 +1474,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1455,7 +1492,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1463,44 +1500,44 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> @@ -1526,33 +1563,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation type="unfinished"/> </message> @@ -1570,16 +1607,6 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation type="unfinished"/> @@ -1620,34 +1647,34 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation type="unfinished"/> </message> @@ -1655,22 +1682,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation type="unfinished"/> </message> @@ -1678,20 +1705,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>ชื่อ</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>ขนาด</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1701,22 +1739,22 @@ It is not advisable to use it.</source> <translation>ตั้งค่า</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>ทั่วไป</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation type="unfinished"/> </message> @@ -1724,27 +1762,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>ทั่วไป</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation type="unfinished"/> </message> @@ -1757,104 +1795,139 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>ป้ายข้อความ</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> - <source>Waiting to upload...</source> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> - <source>Unable to register in sync space.</source> + <location filename="../src/gui/sharedialog.cpp" line="608"/> + <source>Waiting to upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> + <location filename="../src/gui/sharedialog.cpp" line="610"/> + <source>Unable to register in sync space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"/> </message> @@ -1875,30 +1948,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"/> @@ -1907,113 +1975,113 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>ประเทศ:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation type="unfinished"/> @@ -2033,67 +2101,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>การเชื่อมต่อแบบ SSL</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>คำเตือนเกี่ยวกับการเชื่อมต่อด้วย SSL ที่ใช้อยู่</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>ด้วยใบรับรองความปลอดภัย %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;ยังไม่ได้ถูกระบุ&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>หน่วยงาน: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>หน่วย: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>ประเทศ: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>ลายนิ้วมือ (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>ลายนิ้วมือ (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>วันที่บังคับใช้: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>ผู้รับรอง: %1</translation> </message> @@ -2101,219 +2169,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>เสร็จสิ้น</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>ปลั๊กอิน %1 สำหรับ csync could not be loadeไม่สามารถโหลดได้.<br/>กรุณาตรวจสอบความถูกต้องในการติดตั้ง!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync เกิดข้อผิดพลาดบางประการในระหว่างประมวลผล internal trees</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>การจัดสรรหน่วยความจำ CSync ล้มเหลว</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>พบข้อผิดพลาดเกี่ยวกับ CSync fatal parameter</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>การอัพเดทขั้นตอนการประมวลผล CSync ล้มเหลว</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>การปรับปรุงขั้นตอนการประมวลผล CSync ล้มเหลว</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync ไม่สามารถค้นหาพร็อกซี่บนเซิร์ฟเวอร์ได้</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync ล้มเหลวในการยืนยันสิทธิ์การเข้าใช้งานที่เซิร์ฟเวอร์ %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync ล้มเหลวในการเชื่อมต่อกับเครือข่าย</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>เกิดข้อผิดพลาดเกี่ยวกับ HTTP transmission</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync ล้มเหลว เนื่องจากไม่สามารถจัดการกับการปฏิเสธให้เข้าใช้งานได้</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync ได้พยายามที่จะสร้างไดเร็กทอรี่ที่มีอยู่แล้ว</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: ไม่มีพื้นที่เหลือเพียงพอบนเซิร์ฟเวอร์ %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSync ไม่สามารถระบุข้อผิดพลาดได้</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation type="unfinished"/> </message> @@ -2321,7 +2399,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation type="unfinished"/> </message> @@ -2329,17 +2407,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 type="unfinished"/> </message> @@ -2444,6 +2522,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"/> </message> <message> @@ -2490,7 +2569,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"/> </message> @@ -2587,7 +2666,7 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"/> </message> @@ -2764,12 +2843,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> @@ -2777,82 +2856,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>ลบแล้ว</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>ข้อผิดพลาด</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>ไม่ทราบ</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation type="unfinished"/> </message> @@ -2860,52 +2944,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>สถานะไม่สามารถระบุได้</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>กำลังรอการเริ่มต้นเชื่อมข้อมูล</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>การเชื่อมข้อมูลกำลังทำงาน</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>การเชื่อมข้อมูลเสร็จสิ้น</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>เกิดข้อผิดพลาดในการตั้งค่า</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation type="unfinished"/> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index b8dc312a5..3e08720b4 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -30,27 +30,27 @@ <translation>Form</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Bir uzak hedef klasörü seçin</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Klasör Oluştur</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Yenile</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Klasörler</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>MetinEtiketi</translation> </message> @@ -134,97 +134,97 @@ <translation>Devam et</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Klasör Kaldırma İşlemini Onayla</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Gerçekten <i>%1</i> klasörünü eşitlemeyi durdurmak istiyor musunuz?</p><p><b>Not:</b> Bu işlem dosyaları istemcinizden kaldırmayacaktır.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Klasör Sıfırlamayı Onayla</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Gerçekten <i>%1</i> klasörünü sıfırlamak ve istemci veritabanını yeniden inşa etmek istiyor musunuz?</p><p><b>Not:</b> Bu işlev sadece bakım amaçlı tasarlandı. Hiçbir dosya kaldırılmayacak, fakat bu işlem büyük veri trafiğine sebep olabilir ve klasör boyutuna bağlı olarak tamamlanması birkaç dakikadan birkaç saate kadar sürebilir. Bu seçeneği sadece yöneticiniz tarafından istenmişse kullanın.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Eşitleme Çalışıyor</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Ortaya çıkarılan: %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3/%4) %6/s aktarım hızında kalan %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1/%2, dosya %3/%4 Toplam kalan süre: %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>dosya %1/%2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>Sunucudaki %2'lık kotanın %1'ı (%%3) kullanılıyor.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>Şu anda depolama kullanım bilgisi mevcut değil.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation><a href="%1">%2</a> ile bağlı.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation><a href="%1">%2</a> bağlantısı <i>%3</i> olarak yapıldı.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation><a href="%2">%3</a> üzerinde %1 bağlantısı yok.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Hiç %1 bağlantısı yapılandırılmamış.</translation> </message> @@ -257,12 +257,12 @@ Toplam kalan süre: %5</translation> <translation>Sertifika parolası :</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Bir sertifika seçin</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Sertifika dosyaları (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Toplam kalan süre: %5</translation> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Hiçbir ownCloud hesabı yapılandırılmamış</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Yapılandırılmış sunucu, bu istemci için çok eski</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Lütfen en son sunucuya güncelleyin veya istemciyi yeniden başlatın</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>%1 bağlantısı yapılamadı</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>zaman aşımı</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Sağlanan kimlik bilgileri doğru değil</translation> </message> @@ -327,30 +332,38 @@ Toplam kalan süre: %5</translation> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Bağlantı zaman aşımına uğradı</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>csync-context oluşturma başarısız</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>%1 yerel klasörü mevcut değil.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 bir dizin olmalı, ancak değil.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 okunabilir değil.</translation> </message> @@ -464,62 +477,62 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Klasör durumu sıfırılanamadı</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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>Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Tanımlanmamış Durum.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Eşitleme başlatmak için bekliyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Eşitleme için hazırlanıyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Eşitleme çalışıyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Son Eşitleme başarılı oldu.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Son eşitleme başarılıydı, ancak tekil dosyalarda uyarılar vardı.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Kurulum Hatası.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Kullanıcı İptal Etti.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Eşitleme duraklatıldı.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Eşitleme duraklatıldı)</translation> </message> @@ -546,8 +559,8 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Klasör Ekle</translation> </message> @@ -555,67 +568,67 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Eşitlemek için yerel bir klasör seçmek üzere tıklayın.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Yerel klasörün yolunu girin.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>Dizin sahte adı, bu eşitleme bağlantısı için tanımlayıcı bir addır.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Geçerli yerel klasör seçilmedi!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>Seçilen klasöre yazma izniniz yok!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>%1 yerel yolu zaten bir yükleme klasörü. Lütfen farklı bir seçim yapın!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>Zaten geçerli girdide yapılandırılmış bir klasör var.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Seçilen klasör sembolik bir bağlantı. Bu bağlantının işaretlediği klasörde zaten yapılandırılmış bir klasör mevcut.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Zaten yapılandırılmış bir klasör içinde bulunulan klasörü içeriyor.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Seçilen klasör sembolik bir bağlantı. Zaten yapılandırılmış bir klasör, bu bağlantının işaret ettiği geçerli seçimdeki klasörü içeren üst klasörü.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Takma isim boş olamaz. Lütfen açıklayıcı bir takma isim sağlayın.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation><i>%1</i> takma adı zaten kullanımda. Lütfen farklı bir isim seçin.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Kaynak klasörünü seçin</translation> </message> @@ -623,42 +636,47 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Uzak Klasör Oluştur</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>'%1' altında oluşturulacak yeni klasörün adını girin:</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Klasör %1 üzerinde başarıyla oluşturuldu.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>%1 üzerinde klasör oluşturma başarısız. Lütfen elle denetleyin.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Tüm hesabı eşitlemek için bunu seçin</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Bu klasör zaten eşitleniyor.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation><i>%1</i> zaten eşitleniyor. Bu, <i>%2</i> klasörünün üst klasörü.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Zaten tüm dosyalarınızı eşitliyorsunuz. Farklı bir klasör eşitlemek <b>desteklenmiyor</b>. Eğer çoklu klasörleri eşitlemek isterseniz, lütfen şu anda yapılandırılmış kök klasör eşitlemesini kaldırın.</translation> </message> @@ -666,7 +684,7 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Ne Eşitleneceğini Seçin: Eşitlemek istemediğiniz uzak alt klasörlerin seçimini isteğe bağlı olarak kaldırabilirsiniz.</translation> </message> @@ -674,31 +692,35 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Uyarı:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Sunucudan E-Tag alınamadı, Vekil Sunucu/Ağ Geçidi'ni denetleyin.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Devam etmek üzere farklı bir E-Etiket aldık. Sonraki işlemde yeniden denenecek.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Sunucu yanlış içerik aralığı döndürdü</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Bağlantı Zaman Aşımı</translation> </message> @@ -755,12 +777,12 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Parolayı Girin</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Lütfen '%2' kullanıcısı için %1 parolasını girin:</translation> </message> @@ -836,8 +858,8 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Ara:</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Günlük dosyasına yazılamadı</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Hata</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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' dosyası<br/>yazmak üzere açılamadı.<br/><br/>Günlük çıktısı <b>kaydedilemez</b>!</nobr></translation> </message> @@ -896,7 +918,7 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Bağlantı zaman aşımına uğradı</translation> </message> @@ -904,27 +926,27 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Yeni Sürüm Mevcut</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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 İstemcisi yeni sürümü mevcut.</p><p><b>%2</b> artık indirilebilir. Kurulu sürüm %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Bu sürümü atla</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Bu kez atla</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Güncellemeyi al</translation> </message> @@ -1033,54 +1055,53 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Yeni Güncelleme Hazır</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Yeni bir güncelleme kurulmak üzere. Güncelleyici -bu süreç sırasında ek yetki talebinde bulunabilir.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>%1 sürümü indirilyor. Lütfen bekleyin...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>%1 sürümü mevcut. Güncellemeyi başlatmak için uygulamayı yeniden başlatın.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Güncelleme indirilemedi. Lütfen güncellemeyi elle indirmek için <a href='%1'>buraya</a> tıklayın.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Yeni güncellemeler denetlenemedi.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Yeni %1 sürüm mevcut. Lütfen kurulum için sistem güncelleştirme aracını kullanın.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Güncelleme sunucusu denetleniyor...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Güncelleme durumu bilinmiyor: Yeni güncellemeler denetlenemedi.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Güncelleme yok. Kurulumunuz son sürümde.</translation> </message> @@ -1108,28 +1129,33 @@ bu süreç sırasında ek yetki talebinde bulunabilir.</translation> <translation>%1 klasörü '%2', yerel '%3' klasörü ile eşitlendi</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Uyarı:</strong> Şu anda birden fazla yapılandırılmış klasörünüz var. Eğer geçerli ayarlarla devam ederseniz, klasör yapılandırmaları silinecek ve tek bir kök klasör eşitlemesi oluşturulacak!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Uyarı:</strong> Yerel klasör boş değil. Bir çözüm seçin!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Yerel Eşitleme Klasörü</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Gelişmiş kurulumu güncelle</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1147,7 +1173,7 @@ bu süreç sırasında ek yetki talebinde bulunabilir.</translation> <translation>Kullanıcı kimlik bilgilerini gir</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Kullanıcı kimlik bilgilerini güncelle</translation> </message> @@ -1190,129 +1216,139 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">%1 bağlantısı başarılı: %2 sürüm %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>%2 üzerinde %1 adresine bağlanılamadı:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>%2 üzerinde %1 bağlantısı yapılırken zaman aşımı.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>%2 üzerinde %1 bağlantısı deneniyor...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Yerel eşitleme klasörü %1 oluşturuluyor...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>tamam</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>başarısız.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <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="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Uzak klasör belirtilmemiş!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Hata: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <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="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <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="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <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="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <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="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>%1 bağlantısı başarılı!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <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="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Klasör adlandırma başarısız</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <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> @@ -1351,7 +1387,7 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Bağlantı Zaman Aşımı</translation> </message> @@ -1359,7 +1395,7 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>Getirme URL'sinden geçersiz JSON yanıtı</translation> </message> @@ -1395,17 +1431,17 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>%1 dosyası, yerel dosya adı çakışması nedeniyle indirilemiyor!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Dosya tamamıyla indirilemedi.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Yerel bir dosya ismi ile çakıştığından, %1 dosyası kaydedilemedi!</translation> </message> @@ -1413,17 +1449,17 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Geri Yükleme Başarısız:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Kara listelemeye devam et:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Bir dosya veya dizin bir salt okunur paylaşımdan kaldırılmıştı, ancak geri yükleme başarısız oldu: %1</translation> </message> @@ -1431,12 +1467,12 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Uyarı, %1 ile muhtemel harf duyarlılığı çatışması</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>%1 dizini oluşturulamadı</translation> </message> @@ -1444,17 +1480,17 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>'%1' kaldırılırken hata: %2; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>'%1' dizini kaldırılamadı; </translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>%1 dosyası yerel bir dosya adı çakışması nedeniyle kaldırılamadı</translation> </message> @@ -1462,7 +1498,7 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Yerel bir dosya adı çakışması nedeniyle %1 dosyası %2 olarak adlandırılamadı</translation> </message> @@ -1470,45 +1506,45 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Dosya salt okunur bir paylaşımdan kaldırılmıştı. Geri yüklendi.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Sunucu tarafından yanlış HTTP kodu döndürüldü. 204 beklenirken, "%1 %2" alındı.</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Sunucu tarafından yanlış HTTP kodu döndürüldü. 201 beklenirken, "%1 %2" alındı.</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Bu klasörün adı değiştirilmemelidir. Özgün adına geri dönüştürüldü.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Bu klasörün adı değiştirilmemelidir. Lütfen Shared olarak geri adlandırın.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Dosya adlandırıldı ancak salt okunur paylaşımın bir parçası. Özgün dosya geri yüklendi.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Sunucu tarafından yanlış HTTP kodu döndürüldü. 201 beklenirken, "%1 %2" alındı.</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1533,33 +1569,33 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Dosya Kaldırıldı</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Eşitleme sırasında yerel dosya değişti.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>Getirme URL'si eksik</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Eşitleme sırasında yerel dosya kaldırıldı.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation> </message> @@ -1577,16 +1613,6 @@ Kullanmanız önerilmez.</translation> <translation>Eşitleme Etkinliği</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Zaman</translation> @@ -1627,22 +1653,22 @@ Kullanmanız önerilmez.</translation> <translation>Etkinlik listesini panoya kopyala.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Panoya kopyalandı</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Eşitleme durumu panoya kopyalandı.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>Önceki hatalar nedeniyle hiçbir dosya yolsayılmadı ve süren bir indirme yok.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>önceki hatalardan dolayı %n dosya yoksayıldı. @@ -1650,7 +1676,7 @@ Kullanmanız önerilmez.</translation> </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n dosya kısmen indirildi. @@ -1658,7 +1684,7 @@ Kullanmanız önerilmez.</translation> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Bunları tekrar eşitlemeyi deneyin.</translation> </message> @@ -1666,22 +1692,22 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Seçilmemiş klasörler yerel dosya sisteminizden <b>silinecek</b> ve bir daha bu bilgisayarla eşitlenmeyecektir</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Ne Eşitleneceğini Seçin: Eşitlemek istediğiniz uzak alt klasörleri seçin.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Ne Eşitleneceğini Seçin: Eşitlemek istemediğiniz uzak alt klasörlerin seçimini kaldırın.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Ne Eşitleneceğini Seçin</translation> </message> @@ -1689,20 +1715,31 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Yükleniyor...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Ad</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Boyut</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1712,22 +1749,22 @@ Kullanmanız önerilmez.</translation> <translation>Ayarlar</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Hesap</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Etkinlik</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Genel</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Ağ</translation> </message> @@ -1735,27 +1772,27 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Hesap</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Etkinlik</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Genel</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Ağ</translation> </message> @@ -1768,104 +1805,139 @@ Kullanmanız önerilmez.</translation> <translation>YeniBelge.odt dosyasını paylaş</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Paylaşım Bilgisi</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>MetinEtiketi</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>paylaşma etiketi</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>ownCloud Yolu:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Paylaşma bağlantısı</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Parolayı ayarla</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Son kullanma tarihini ayarla</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Parolayı ayarla</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1 yol: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>%1 Paylaşma</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Parola Korumalı</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Herkese açık bağlantı için bir parola seçin</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>OCS API hata kodu: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Yapılandırılmış eşitleme klasörü yok.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Yüklenecek bir klasör bulunamıyor.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>Harici dizinlerin paylaşımı henüz çalışmıyor.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Aynı isimde bir eşleşme dosyası zaten mevcut. Bu dosya eşitlemek üzere kaydedilemez.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>Harici dizinlerin paylaşımı henüz çalışmıyor.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Yüklemek için bekliyor...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Eşitleme uzayında kaydetme başarısız.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Dosya eşitlenemiyor.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>Kayıtlı dosyanın eşitlenmesi henüz başarılı değil.</translation> </message> @@ -1886,30 +1958,25 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Kimlik Doğrulaması</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Yeniden kimlik doğrulama gerekli</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Oturumunuzun süresi doldu. İstemciyi kullanmaya devam etmek için yeniden oturum açmanız gerekiyor.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>%1 ile paylaş</translation> @@ -1918,114 +1985,114 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Sertifika Ayrıntıları</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Ortak Ad (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Konu Alternatif İsimleri:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Kurum (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Kuruluş Birimi (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Bölge/İlçe:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Ülke:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Seri No:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Veren</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Veren:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Verilme:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Bitiş:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Parmak İzleri</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Not:</b> Bu sertifika el ile onaylandı</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (kendinden imzalı)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>Bu bağlantı %1 bit %2 kullanılarak şifrelenmiştir. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Sertifika bilgisi:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>Bu bağlantı şifrelenmediğinden güvenli DEĞİL. @@ -2046,67 +2113,67 @@ Kullanmanız önerilmez.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL Bağlantısı</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Geçerli SSL Bağlantısı hakkında uyarılar:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>Sertifika: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;belirtilmemiş&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Kurum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Birim: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Ülke: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Parmak izi (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Parmak izi (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Etkili Tarih: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Son Kullanım Tarihi: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Veren: %1</translation> </message> @@ -2114,219 +2181,229 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Başarılı.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync, günlük dosyası yükleyemedi veya oluşturamadı. Lütfen yerel eşitleme dizininde okuma ve yazma izinleriniz olduğundan emin olun.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>CSync günlük dosyasını yükleyemedi. Günlük dosyası bozuk.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>Csync için %1 eklentisi yüklenemedi.<br/>Lütfen kurulumu doğrulayın!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync dahili ağaçları işlerken bir hata ile karşılaştı.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync bellek ayıramadı.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>CSync ciddi parametre hatası.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSync güncelleme süreç adımı başarısız.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync uzlaştırma süreç adımı başarısız.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync vekil sunucuda kimlik doğrulayamadı.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync bir vekil veya sunucu ararken başarısız oldu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync %1 sunucusunda kimlik doğrularken başarısız oldu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync ağa bağlanamadı.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Bir ağ zaman aşımı meydana geldi.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Bir HTTP aktarım hatası oluştu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync ele alınmayan izin reddinden dolayı başarısız.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync erişemedi:</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync, zaten mevcut olan bir dizin oluşturmaya çalıştı.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: %1 sunucusunda kullanılabilir alan yok.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSync belirtilmemiş hata.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Kullanıcı tarafından iptal edildi</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>Bağlanan dizin geçici olarak sunucuda kullanılabilir değil</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Bir dizin açılırken hata oluştu</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>%1 numaralı bir hata oluştu.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Bu öge, önceki hatalardan dolayı eşitlenemiyor: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Sembolik bağlantılar eşitlemede desteklenmiyor.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Sabit bağlantılar eşitlemede desteklenmemektedir.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Dosya yoksayma listesinde.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Dosya, çapraz platform arasında eşitlenemeyecek karakterler içeriyor.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Dosya adı kodlaması geçerli değil</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Bir eşitleme günlüğü başlatılamadı.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Eşitleme günlüğü açılamıyor</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"Eşitlenecekleri seçin" kara listesinde olduğundan yoksayıldı.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Üst dizin ekleme yetkiniz olmadığından izin verilmedi</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Bu dizine dosya ekleme yetkiniz olmadığından izin verilmedi</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Kaldırmaya izin verilmedi, geri alınıyor</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Yerel dosyalar ve paylaşım klasörü kaldırıldı.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Taşımaya izin verilmedi, öge geri alındı</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>%1 salt okunur olduğundan taşımaya izin verilmedi</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>hedef</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>kaynak</translation> </message> @@ -2334,7 +2411,7 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2342,17 +2419,17 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Sürüm %1. Daha fazla bilgi için lütfen <a href='%2'>%3</a> adresini ziyaret edin.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p>Telif Hakkı ownCloud Anonim Şirketi</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 tarafından dağıtılmış ve GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır.<br/>%2 ve %2 logoları ABD ve/veya diğer ülkelerde %1 tescili markalarıdır.</p></translation> </message> @@ -2457,7 +2534,8 @@ Kullanmanız önerilmez.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Şimdi çök</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2503,7 +2581,7 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Sürüm %2. Daha fazla bilgi için lütfen <a href="%3">%4</a> adresini ziyaret edin.</p><p><small>Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz ve diğerleri tarafından yazıldı.</small></p><p>Telif hakkı ownCloud, Anonim Şirketi.</p><p>GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır.<br>ownCloud ve ownCloud logoları <br>ABD ve/veya diğer ülkelerde ownCloud, Anonim Şirketi'nin tescili markalarıdır.</p></translation> </message> @@ -2600,7 +2678,7 @@ Kullanmanız önerilmez.</translation> <translation>İstemci taraflı TLS sertifikasını yapılandır</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p><em>%1</em> güvenli sunucu adresine bağlantı başarısız. Nasıl devam etmek istersiniz?</p></body></html></translation> </message> @@ -2777,12 +2855,12 @@ Kullanmanız önerilmez.</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Sistem Çekmecesi kullanılamıyor</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 çalışan bir sistem çekmecesi gerektirir. Eğer XFCE kullanıyorsanız lütfen <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">bu talimatları</a> takip edin. Aksi halde 'trayer' benzeri bir sistem çekmece uygulaması kurun ve yeniden deneyin.</translation> </message> @@ -2790,82 +2868,87 @@ Kullanmanız önerilmez.</translation> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small><a href="%1">%2</a> Git gözden geçirmesi ile %3, %4 tarihinde, Qt %5 kullanılarak derlendi.</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>İndirildi</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Yüklendi</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Silindi</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>%1 konumuna taşındı</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Yoksayıldı</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Dosya sistemi erişim hatası</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Hata</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Bilinmeyen</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>indirilen:</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>yüklenen:</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>silinen:</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>taşınan:</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>yoksayılan:</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>hata</translation> </message> @@ -2873,52 +2956,52 @@ Kullanmanız önerilmez.</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Tanımsız durum</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Eşitlemenin başlanması bekleniyor</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Eşitleme çalışıyor</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Eşitleme Başarılı</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <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="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Eşitleme Hatası</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Kurulum Hatası</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Eşitleme için hazırlanıyor</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>İptal ediliyor...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Eşitleme duraklatıldı</translation> </message> diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 6915c3261..953473299 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -30,27 +30,27 @@ <translation>Форма</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Оберіть віддалену теку для зберігання даних</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>Створити теку</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Оновити</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Теки</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>Мітка</translation> </message> @@ -134,97 +134,97 @@ <translation>Відновлення</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>Підтвердіть видалення каталогу</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Дійсно бажаєте зупинити синхронізацію теки <i>%1</i>?</p><p><b>Примітка:</b> Файли у вашому клієнті не будуть видалені.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>Підтвердіть скидання теки</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>Ви дійсно бажаєте скинути теку <i>%1</i> та перебудувати клієнтську базу даних?</p><p><b>Зверніть увагу:</b> Дана функція призначена лише для технічного обслуговування. Файли не будуть видалені, але, в залежності від розміру теки, операція може зайняти від кількох хвилин до кількох годин та може бути переданий великий обсяг даних. Використовуйте дану операцію лише за рекомендації адміністратора.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>Виконується синхронізація</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <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="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>Виявлення '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 of %4). Залишилось %5 на швидкості %6/s</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 of %4)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 of %2, файл %3 з %4 Залишилось: %5</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>файл %1 з %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>Використовується %1 (%3%) з %2 місця на сервері.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>На даний час немає відомостей про наповнення сховища.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Підключено до <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>Підключено до <a href="%1">%2</a> як <i>%3</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>Немає зв'язку з %1 за адресою <a href="%2">%3</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>Жодного %1 підключення не налаштовано.</translation> </message> @@ -257,12 +257,12 @@ Total time left %5</source> <translation>Пароль сертіфікату :</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>Оберіть сертифікат</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>Файли сертіфікатів (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Total time left %5</source> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>Обліковий запис ownCloud не налаштовано</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>Налаштований сервер застарий для цього клієнта</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>Будь ласка, оновіть сервер до останньої версії та перезавантажте клієнт.</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>Не вдалося підключитися до %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>час вичерпано</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>Введені дані не вірні</translation> </message> @@ -327,30 +332,38 @@ Total time left %5</source> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>Час очікування з'єднання перевищено</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>Неможливо створити csync-контекст</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>Локальна тека %1 не існує.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 повинна бути текою, але нею не є.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 не читається.</translation> </message> @@ -464,62 +477,62 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>Не вдалося скинути стан теки</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>Невизначений стан.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>Очікування початку синхронізації.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>Підготовка до синхронізації</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>Синхронізація запущена.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>Остання синхронізація була успішною.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Остання синхронізація пройшла вдало, але були зауваження про деякі файли.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>Помилка установки.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>Відмінено користувачем.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>Синхронізація призупинена.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (Синхронізація призупинена)</translation> </message> @@ -546,8 +559,8 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>Додати Теку</translation> </message> @@ -555,67 +568,67 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>Натисніть, щоб обрати локальну теку для синхронізації.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>Введіть шлях до локальної теки.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>Псевдонім каталогу - наочне ім'я для цієї синхронізації.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>Локальний каталог не обрано!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>У вас немає прав на запис в цю теку!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>Локальний шлях %1 вже належить каталогу для завантаження. Будь ласка, оберіть інший!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>В поточному запису містяться вже налаштовані теки.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>Обрана тека є символічним посиланням. В теці, на яку веде посилання, вже існує тека, що синхронізується. </translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>Вже налаштований каталог містить вказану теку.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>Обрана тека є символічним посиланням. Тека, що вже синхронізується, має посилання на обрану директорію.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>Псевдонім не може бути порожнім. Будь ласка, вкажіть описове слово-псевдонім.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>Псевдонім <i>%1</i> уже використовується. Будь ласка, оберіть інший.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>Оберіть початкову теку</translation> </message> @@ -623,42 +636,47 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>Створити Віддалену Теку</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <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="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>Теку успішно створено на %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Не вдалося створити теку на %1. Будь ласка, перевірте вручну.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>Оберіть це для синхронізації всього облікового запису</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>Тека вже синхронізується.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <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="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>Всі ваші файли синхронізуються. Синхронізація інших тек в цьому режимі <b>не</b> підтримується. Якщо вам необхідно синхронізувати декілька локальних каталогів, спочатку видаліть синхронізацію батьківської теки.</translation> </message> @@ -666,7 +684,7 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>Оберіть, що Синхронізувати: Ви можете вимкнути синхронізацію для деяких підкаталогів.</translation> </message> @@ -674,31 +692,35 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>Увага:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Не отримано E-Tag від серверу, перевірте мережеві налаштування (проксі, шлюз)</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Ми отримали інший E-Tag для відновлення. Спробуйте ще раз пізніше.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>Сервер повернув невірний content-range</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>Тайм-аут З'єднання</translation> </message> @@ -755,12 +777,12 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>Введіть Пароль</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>Будь ласка, введіть пароль від %1 для користувача '%2':</translation> </message> @@ -836,8 +858,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>&Пошук: </translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>Не вдалося записати файл журналу</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>Помилка</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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> @@ -896,7 +918,7 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>Час очікування з'єднання перевищено</translation> </message> @@ -904,27 +926,27 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>Доступна Нова Версія</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>Пропустити цю версію</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>Пропустити цього разу</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>Отримати оновлення</translation> </message> @@ -1033,54 +1055,53 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>Доступна нова версія</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>Оновлення встановлюється. Під час оновлення -програмі можуть знадобитися додаткові привілеї.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>Завантаження файлів %1. Будь ласка, почекайте...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>Доступна версія %1. Перезавантажте додаток та оновіть його.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Неможливо завантажити оновлення. Будь ласка, натисніть <a href='%1'>тут</a>, щоб самостійно завантажити оновлення.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>Не вдалося перевірити наявність оновлень. </translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>Доступна нова версія %1. Будь ласка, скористайтесь оновленням системи для встановлення.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>Перевірка оновлень на сервері...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Статус оновлення невідомий: Не вдалося перевірити наявність оновлень.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>У вас встановленно останню версію.</translation> </message> @@ -1108,28 +1129,33 @@ for additional privileges during the process.</source> <translation>%1 тека '%2' синхронізована з локальним каталогом '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation><p><small><strong>Увага:</strong> У вас налаштовано декілька каталогів. Якщо ви продовжите з цими налаштуваннями, налаштування тек будуть відкинуті та буде створена одна батьківська тека!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory 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="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>Локальна Тека для Синхронізації</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>Оновити додаткові налаштування</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1147,7 +1173,7 @@ for additional privileges during the process.</source> <translation>Внести облікові дані</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>Оновити облікові дані</translation> </message> @@ -1190,129 +1216,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <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="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <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="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Перевищено час очікування з'єднання до %1 на %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>Спроба підключення до %1 на %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>Створення локальної теки для синхронізації %1... </translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>не вдалося.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>Не вдалося створити локальну теку $1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>Не вказано віддалену теку!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>Помилка: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>створення теки на ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>Віддалена тека %1 успішно створена.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Віддалена тека %1 вже існує. Під'єднання для синхронізації.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Створення теки завершилось HTTP помилкою %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>Успішно під'єднано до %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Підключення до %1 встановити не вдалося. Будь ласка, перевірте ще раз.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>Не вдалося перейменувати теку</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Локальна тека синхронізації %1 успішно створена!</b></font></translation> </message> @@ -1351,7 +1387,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>Тайм-аут З'єднання</translation> </message> @@ -1359,7 +1395,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>Неправильна JSON відповідь на сформований URL</translation> </message> @@ -1395,17 +1431,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Файл %1 не завантажено, через локальний конфлікт ім'я! </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>Файл не може бути завантажений повністю.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Файл %1 не збережено, через локальний конфлікт ім'я! </translation> </message> @@ -1413,17 +1449,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; Відновлення не вдалося:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>Продовжити занесення до чорного списку:</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>Файл або каталог було видалено з опублікованої теки з правами тільки на перегляд, але відновити його не вдалося: %1</translation> </message> @@ -1431,12 +1467,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Увага, можливий конфлікт чутливості до реєстру з %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>Не вдалося створити теку %1</translation> </message> @@ -1444,17 +1480,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>Помилка при видалені '%1': %2;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>Неможливо видалити теку '%1';</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Неможливо видалити %1 через локальний конфлікт імен</translation> </message> @@ -1462,7 +1498,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>%1 не можна перейменувати на %2 через локальний конфлікт імен</translation> </message> @@ -1470,45 +1506,45 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>Файл видалено з опублікованої теки з правами тільки на перегляд. Файл відновлено.</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>Сервер відповів неправильним HTTP кодом. Очікувався 204, але отриманий "%1 %2".</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Сервер відповів неправильним HTTP кодом. Очікувався 201, але отриманий "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>Цю теку не можна перейменувати. Буде повернено старе ім'я.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>Цю теку не можна перейменувати. Будь ласка, поверніть їй ім'я Shared.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>Файл було перейменовано, але він розташований в теці з правами лише на перегляд. Відновлено оригінальний файл. </translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>Сервер відповів неправильним HTTP кодом. Очікувався 201, але отриманий "%1 %2".</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1533,33 +1569,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>Файл переміщено</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>Локальний файл змінився під час синхронізації.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>Файл було змінено локально, але він розташований в теці з правами лише на перегляд. Файл відновлено, а ваші зміни розташовані в теці конфліктів.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>Не вистачає сформованого URL</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>Локальний файл було видалено під час синхронізації.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>Сервер не зміг підтвердити останній відрізок даних. (Були відсутні e-tag)</translation> </message> @@ -1577,16 +1613,6 @@ It is not advisable to use it.</source> <translation>Журнал синхронізації</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>Час</translation> @@ -1627,22 +1653,22 @@ It is not advisable to use it.</source> <translation>Скопіювати протокол синхронізації до буферу обміну.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>Скопійовано в буфер обміну</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>Протокол синхронізації був скопійований в буфер обміну.</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>На даний час жоден файл не ігнорується, через попередні помилки, та немає активних завантажень.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>%n файл пропущено через попередні помилки. @@ -1651,7 +1677,7 @@ It is not advisable to use it.</source> </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n файлів частково завантажений. @@ -1660,7 +1686,7 @@ It is not advisable to use it.</source> </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>Спробуйте синхронізувати ще раз.</translation> </message> @@ -1668,22 +1694,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Не позначені теки будуть <b>видалені</b> з вашої системи та більше не будуть синхронізуватися</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>Виберіть Що Синхронізувати: Виберіть папки на віддаленому сервері, які Ви хотіли б синхронізувати.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>Виберіть Що Синхронізувати: Зніміть вибір папок на віддаленому сервері, які Ви не хочете синхронізувати.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>Оберіть, що хочете синхронізувати</translation> </message> @@ -1691,20 +1717,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>Завантаження ...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>Ім'я</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>Розмір</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1714,22 +1751,22 @@ It is not advisable to use it.</source> <translation>Налаштування</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>Обліковий запис</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>Активність</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>Загалом</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>Мережа</translation> </message> @@ -1737,27 +1774,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>Обліковий запис</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>Активність</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>Загалом</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>Мережа</translation> </message> @@ -1770,104 +1807,139 @@ It is not advisable to use it.</source> <translation>Поділитися NewDocument.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>Поділитися Інформацією</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>Мітка</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>поділитися міткою</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>Шлях до OwnCloud:</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>Опублікувати посилання</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>Встановіть пароль</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>Встановіть дату закінчення</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>Встановіть пароль</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1 шлях: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>Ви поділилися %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>Захищено паролем</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>Оберіть пароль для опублікованого посилання</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>OCS API код помилки: %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>Немає папок налаштованих для синхронізації.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> - <translation>Неможливо знайти папку для завантаження в неї.</translation> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> - <translation>Функція відкриття доступу до зовнішніх папок поки не працює.</translation> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> - <translation>Існує файл з ім'ям як у синхронізованого. Файл не може бути прийнятий до синхронізації.</translation> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation>Функція відкриття доступу до зовнішніх папок поки не працює.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>Очікування завантаження...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation>Неможливо зареєструватися в синхронізованому просторі.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation>Файл не може бути синхронізований.</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation>Синхронізація зареєстрованого файлу поки не була успішною.</translation> </message> @@ -1888,30 +1960,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation>%1 - Аутентифікація</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation>Потрібна повторна аутентифікація</translation> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation>Ваша сесія скінчилася. Вам потрібно ввійти знову, щоб продовжити користуватися програмою.</translation> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Поділитися з %1</translation> @@ -1920,114 +1987,114 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>Деталі сертифікату</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>Загальне Ім'я (CN):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>Альтернативне Ім'я:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>Організація (O):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>Підрозділ (OU):</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>Область:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>Країна:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>Серія:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>Видавець</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>Видавець:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>Видано для:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>Закінчується:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>Відбитки пальців</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>Примітка:</b> Цей сертифікат був схвалений вручну</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (самозавірений)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>З'єднання зашифроване %1-бітним %2. </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>Інформація про сертифікат:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>З'єднання НЕ зашифровано. @@ -2048,67 +2115,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL з'єднання</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>Попередження про існуюче SSL з'єднання:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>з Сертифікатом %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;не вказано&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>Організація: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>Підрозділ: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>Країна: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>Відбиток (MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Відбиток (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>Дата введення в дію: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation>Термін Дії: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>Емітент: %1</translation> </message> @@ -2116,219 +2183,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>Успішно.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>CSync не зміг завантажити або створити файл протоколу. Перевірте, чи надано права на перегляд та запис до локальної теки.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation>CSync не вдалося завантажити файл журналу. Файл журналу пошкоджений.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p> %1 плагін для синхронізації не вдалося завантажити.<br/>Будь ласка, перевірте його інсталяцію!</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>У CSync виникла помилка під час сканування внутрішньої структури каталогів.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync не вдалося зарезервувати пам'ять.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>У CSync сталася фатальна помилка параметра.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSync не вдалася зробити оновлення .</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync не вдалася зробити врегулювання.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation>CSync не вдалося аутентифікуватися на проксі-сервері.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync не вдалося знайти Проксі або Сервер.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync не вдалося аутентифікуватися на %1 сервері.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync не вдалося приєднатися до мережі.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>Час під'єднання до мережі вичерпався.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>Сталася помилка передачі даних по HTTP.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync завершився неуспішно через порушення прав доступу.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>CSync не має доступу</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync намагалася створити каталог, який вже існує.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync: на сервері %1 скінчилося місце.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>Невизначена помилка CSync.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>Перервано користувачем</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation>Приєднана тека тимчасово недоступна на сервері</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> - <translation>Сталася помилка при відкритті теки</translation> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> - <translation>Виникла внутрішня помилка за номером %1.</translation> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation>Шлях не синхронізується через помилки: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>Синхронізація символічних посилань не підтримується. </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation>Синхронізація жорстких посилань не підтримується.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>Файл присутній у списку ігноруємих.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation>Файл містить недопустимі символи, через це синхронізація між платформами неможлива.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation>Кодування файлу не припустиме</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>Не вдалося ініціалізувати протокол синхронізації.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>Не вдається відкрити протокол синхронізації</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ігнорується через чорний список в "обрати що синхронізувати"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation>Не дозволено через відсутність прав на додавання підкаталогів в цій теці.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation>Не дозволено через відсутність прав на додавання батьківської теки.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation>Не дозволено через відсутність прав на додавання файлів в цю теку.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <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/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation>Не дозволено видаляти, відновлюємо</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation>Локальні файли та теки в загальному доступі було видалено.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation>Переміщення не дозволено, елемент відновлено </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation>Переміщення не дозволено, оскільки %1 помічений тільки для перегляду</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>призначення</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>джерело</translation> </message> @@ -2336,7 +2413,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2344,17 +2421,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation><p>Версія %1. Для отримання більш детальної інформації, будь ласка, відвідайте <a href='%2'>%3</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation><p> Права належать ownCloud, Incorporated </p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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> @@ -2459,7 +2536,8 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> - <translation>Критична помилка</translation> + <comment>Only shows in debug mode to allow testing the crash handler</comment> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="446"/> @@ -2505,7 +2583,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation><p>Версія %2. Для більш детальної інформації відвідайте <a href="%3">%4</a></p> <p><small> Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz та інші.</ small></p> <p> Права належать ownCloud, Inc. </p> <p> Під ліцензією GNU General Public License (GPL) Version 2.0 <br/> ownCloud і логотип ownCloud є зареєстрованими товарними знаками ownCloud, Inc. в США та інших країнах. </p></translation> </message> @@ -2602,7 +2680,7 @@ It is not advisable to use it.</source> <translation>Налаштувати TLS сертифікат клієнта</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation><html><head/><body><p>Не вдалося підключитися до безпечного серверу за адресою <em>%1</em>. Як Ви хочете продовжити?</p></body></html></translation> </message> @@ -2779,12 +2857,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>Системний Трей не доступний</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 вимагає працюючий системний трей. Якщо ви використовуєте XFCE, будь ласка перегляньте <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">інструкцію</a>. В інакшому випадку, встановіть системний трей (наприклад trayer), та спробуйте ще раз.</translation> </message> @@ -2792,82 +2870,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> - <translation><p><small>Створено з версії Git <a href="%1">%2</a> на %3, %4 використовуючи Qt %5.</small><p></translation> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>Завантажено</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>Вивантажено</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>Видалено</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>Переміщено до %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>Проігноровано</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>Помилка доступу до файлової системи</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>Помилка</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>Невідомо</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>зкачування</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>завантаження</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>видалення</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>переміщення</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>ігнорування</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>помилка</translation> </message> @@ -2875,52 +2958,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>Статус не визначено</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>Очікування початку синхронізації</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>Проводиться синхронізація</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>Синхронізація успішно виконана</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation>Синхронізацію завершено, деякі файли проігноровано.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>Помилка синхронізації</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>Помилка налаштування</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>Підготовка до синхронізації</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>Відміна...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>Синхронізація призупинена</translation> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index be332b5b6..fb0dbc467 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -30,27 +30,27 @@ <translation>窗体</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>选择远端目标文件夹</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>创建文件夹</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>刷新</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>文件夹</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>文本标签</translation> </message> @@ -134,97 +134,97 @@ <translation>继续</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>确认移除文件夹</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>你真的要停止 <i>%1%</i> 文件夹的同步吗？</p><p><b>注释：</b>这不会删除你客户端中的文件。</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>确认文件夹重置</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation><p>您真希望重置文件夹 <i>%1</i> 并重新构建您的客户端数据库吗？</p><p><b>注意：</b>此功能设计仅用作维护操作。没有文件将被移除，但这将导致大量的数据传输。根据文件夹的大小，这一过程将持续几分钟到几小时。请仅在管理员指导的情况下使用此功能。</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>同步正在运行</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <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="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>正在发现 '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation>%1 %2 (%3 / %4)，%5 后完成 (%6/s)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <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/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation>%1 / %2 （第 %3 个文件，共 %4 个） %5 后全部完成</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation>第 %1 个文件，共 %2 个</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>已使用 %3% 的服务器空间 (%1 / %2)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation>目前没有储存使用量信息可用。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>已连接到<a href="%1">%2</a>。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation>已作为 <i>%3</i> 连接到 <a href="%1">%2</a>。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation>无法连接 %1 （<a href="%2">%3</a>）。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>没有 %1 连接配置。</translation> </message> @@ -257,12 +257,12 @@ Total time left %5</source> <translation>证书密码：</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>选择证书</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>证书文件 (*.p12 *.pfx)</translation> </message> @@ -293,33 +293,38 @@ Total time left %5</source> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>没有已经配置的 ownCloud 帐号</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>此客户端连接到的服务器版本过旧</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation>请更新到最新的服务器版本然后重启客户端。</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>无法连接到 %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>超时</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation>提供的证书不正确</translation> </message> @@ -327,30 +332,38 @@ Total time left %5</source> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>连接超时</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation>不能生成 csync-context</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>本地文件夹 %1 不存在。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>%1 应为目录但并不是。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 不可读。</translation> </message> @@ -464,62 +477,62 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>不能重置文件夹状态</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>未知状态。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>等待启动同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>准备同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>同步正在运行。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>最后一次同步成功。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>上次同步已成功，不过一些文件出现了警告。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>安装失败</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>用户撤销。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>同步已暂停。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (同步已暂停)</translation> </message> @@ -546,8 +559,8 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>增加目录</translation> </message> @@ -555,67 +568,67 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation>点击选择进行同步的本地文件夹。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation>输入本地文件夹的路径。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation>目录别名</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation>未选择有效的本地文件夹！</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>你没有写入所选文件夹的权限！</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation>本地路径 %1 已经是同步文件夹。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>当前路径包含一个已配置的文件夹。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation>选择的文件夹是一个符号连接，连接指向的文件夹已经是同步文件夹。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation>选择的文件夹在已有的同步文件夹中。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation>选择的文件夹是一个符号连接，连接指向的文件夹已经在已有的同步文件夹中。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>别名不能为空。请提供一个描述性的别名。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>别名 <i>%1</i> 已被占用。请使用另一个别名。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>选择源目录</translation> </message> @@ -623,42 +636,47 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>创建远程文件夹</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <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="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>文件夹在您的 %1 上不可用。<br/>请点此创建它。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>无法在 %1 处创建文件夹。请自行检查。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation>选择此项以同步整个账户</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>文件夹已在同步中。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <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="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation>你已经设置同步了你的所有文件，无法同步另一文件夹。要同步多个文件夹，请取消当前设置的根文件夹同步。</translation> </message> @@ -666,7 +684,7 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation>选择同步内容（取消选中不需同步的远程子文件夹）</translation> </message> @@ -674,31 +692,35 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>警告：</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>未能收到来自服务器的 E-Tag，请检查代理/网关</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>我们收到了不同的恢复 E-Tag，将在下次尝试。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>服务器返回了错误的内容长度</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>连接超时</translation> </message> @@ -755,12 +777,12 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>输入密码</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>请输入账户 %2 的 %1 密码：</translation> </message> @@ -836,8 +858,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>搜索 (&S)： </translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -876,19 +898,19 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>无法写到日志文件</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>错误</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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> @@ -896,7 +918,7 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>连接超时</translation> </message> @@ -904,27 +926,27 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>新版本可用</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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。</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>跳过这个版本</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>本次跳过</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>获取更新</translation> </message> @@ -1033,53 +1055,53 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>新的更新已经准备就绪</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation>更新将会安装。安装过程可能会要求额外的权限。</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation>正在下载版本 %1，请稍后....</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation>版本 %1 现在可用，请重启应用以开始更新。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>无法下载更新，请点击<a href='%1'>此处</a>手动下载更新。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation>无法检查新更新。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation>新版本 %1 已经可用，使用系统更新工具升级。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation>检查更新服务器</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>还没有检查过更新。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation>亲，你使用的已经是最新的版本了</translation> </message> @@ -1107,28 +1129,33 @@ for additional privileges during the process.</source> <translation>%1 文件夹 '%2' 将被同步到本地文件夹 '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation>警告：当前设置了多个文件夹。如果继续当前操作，文件夹设置将丢失，且一个根文件夹会被建立并同步。</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory 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="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>本地同步文件夹</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>更新高级设置</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1146,7 +1173,7 @@ for additional privileges during the process.</source> <translation>输入用户密码</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>修改用户密码</translation> </message> @@ -1188,129 +1215,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <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="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <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="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>连接到 %1 （%2） 时超时。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>尝试连接位于 %2 的 %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>正在创建本地同步文件夹 %1...</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>成功</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>失败</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>不能创建本地文件夹 %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation>未指定远程文件夹！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>错误：%1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>在 ownCloud 创建文件夹：%1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>远程目录%1成功创建。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>远程文件夹 %1 已存在。连接它以供同步。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>创建文件夹出现 HTTP 错误代码 %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>成功连接到了 %1！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>无法建立到 %1的链接，请稍后重试</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>文件夹更名失败</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>本地同步目录 %1 已成功创建</b></font></translation> </message> @@ -1349,7 +1386,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>连接超时</translation> </message> @@ -1357,7 +1394,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation>推送 URL 传来的 JSON 无效</translation> </message> @@ -1393,17 +1430,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>由于本地文件名冲突，文件 %1 无法下载。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>文件无法完整下载。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>由于本地文件名冲突，文件 %1 无法保存。</translation> </message> @@ -1411,17 +1448,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> - <translation>; 恢复失败：</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> - <translation>继续排除：</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation>文件（夹）移除了只读共享，但恢复失败：%1</translation> </message> @@ -1429,12 +1466,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>小心！%1 的文件名可能有大小写冲突</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>不能创建文件夹 %1</translation> </message> @@ -1442,17 +1479,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> - <translation>移除 %1 时出错：%2;</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>不能删除文件夹 %1</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation>由于本地文件名冲突，不能删除 %1</translation> </message> @@ -1460,7 +1497,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>由于本地文件名冲突，文件 %1 无法更名为 %2</translation> </message> @@ -1468,45 +1505,45 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation>文件已经移除只读共享，并已经恢复。</translation> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> - <translation>服务器返回的 HTTP 状态错误，应返回 204，但返回的是“%1 %2”。</translation> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>服务器返回的 HTTP 状态错误，应返回 201，但返回的是“%1 %2”。</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation>文件无法更名，已经恢复为原文件名。</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation>文件无法更名，请改回“Shared”。</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation>文件已经更名，但这是某个只读分享的一部分，原文件已经恢复。</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> - <translation>服务器返回的 HTTP 状态错误，应返回 201，但返回的是“%1 %2”。</translation> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1531,33 +1568,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>已移除文件</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation>本地文件在同步时已修改。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation>文件已经在本地修改，但这是某个只读分享的一部分，原文件已经恢复。您的修改已保存在冲突文件中。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation>缺少轮询 URL</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation>本地文件在同步时已删除。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation>服务器找不到上一分块。（找不到 E-tag）</translation> </message> @@ -1575,16 +1612,6 @@ It is not advisable to use it.</source> <translation>同步活动</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>时间</translation> @@ -1625,36 +1652,36 @@ It is not advisable to use it.</source> <translation>复制动态列表到剪贴板。</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>复制到剪贴板</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation>同步状态已经复制到剪贴板。</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation>没有文件因上次错误而被忽略，没有下载正在进行。</translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation><numerusform>由于上次错误， %n 个文件被忽略。 </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation><numerusform>%n 个文件被部分下载。 </numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation>试试重新同步这些内容。</translation> </message> @@ -1662,22 +1689,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>取消选中的文件夹将会从本地<b>删除</b>，并不再同步到这台电脑上。</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation>选择同步内容（选中需同步的远程子文件夹）</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation>选择同步内容（取消选中不需同步的远程子文件夹）</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>选择同步内容</translation> </message> @@ -1685,20 +1712,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>加载中...</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>名称</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>大小</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1708,22 +1746,22 @@ It is not advisable to use it.</source> <translation>设置</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>账户</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>动态</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>常规</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>网络</translation> </message> @@ -1731,27 +1769,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>账户</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>动态</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>常规</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>网络</translation> </message> @@ -1764,104 +1802,139 @@ It is not advisable to use it.</source> <translation>分享 NewDocument.odt</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>分享信息</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>文本标签</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation>分享标签</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> - <translation>OwnCloud 地址：</translation> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>分享链接</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>设置密码</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation>设置有效期</translation> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>设置密码</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation>%1 路径：%2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>%1 分享</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>密码保护</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>为共享链接设置密码</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation>OCS API 错误代码：%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> - <source>Waiting to upload...</source> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> - <source>Unable to register in sync space.</source> + <location filename="../src/gui/sharedialog.cpp" line="608"/> + <source>Waiting to upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> + <location filename="../src/gui/sharedialog.cpp" line="610"/> + <source>Unable to register in sync space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"/> </message> @@ -1882,30 +1955,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"/> @@ -1914,114 +1982,114 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>证书信息</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation>常用名 (CN)：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation>主体备用名称：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation>组织 (O)：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation>单位 (OU)：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>州/省：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>国家：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>序列号：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>颁发者</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>颁发者：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>颁发于：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>过期于：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation><h3>证书指纹</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>注意：</b>此证书经手动批准</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation>%1 (自签署)</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation>此连接通过 %1 位的 %2 加密。 </translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>证书信息：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation>此连接未经过加密。 @@ -2042,67 +2110,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL链接</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>当前 SSL 连接的警告：</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>使用证书 %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;未指定&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>组织：%1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>单位：%1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>国家: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>MD5指纹: <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>SHA1指纹: <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>有效日期：%1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>签发人：%1</translation> </message> @@ -2110,219 +2178,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>成功。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation>Csync同步失败，请确定是否有本地同步目录的读写权</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>csync 的 %1 插件不能加载。<br/>请校验安装！</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync 在处理内部文件树时出错。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync 失败，内存不足。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>CSync 致命参数错误。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSync 处理步骤更新失败。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync 处理步骤调和失败。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync 无法查询代理或服务器。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync 于 %1 服务器认证失败。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync 联网失败。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>网络连接超时。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>HTTP 传输错误。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>出于未处理的权限拒绝，CSync 失败。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation>访问 CSync 失败</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync 尝试创建了已有的文件夹。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync：%1 服务器空间已满。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSync 未定义错误。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>用户撤销</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation>符号链接不被同步支持。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation>文件在忽略列表中。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>无法初始化同步日志</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>无法打开同步日志</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>已忽略（“选择同步内容”黑名单）</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation type="unfinished"/> </message> @@ -2330,7 +2408,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2338,17 +2416,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 type="unfinished"/> </message> @@ -2453,6 +2531,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"/> </message> <message> @@ -2499,7 +2578,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"/> </message> @@ -2596,7 +2675,7 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"/> </message> @@ -2773,12 +2852,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>系统托盘不可用</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 依赖于系统托盘程序。如果你在运行 XFCE，请按 <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">这个指南（英文）</a> 来设置。否则，请安装一个系统托盘程序，比如 trayer，然后再试。</translation> </message> @@ -2786,82 +2865,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>已下载</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>已上传</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>已删除</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>已移动到 %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>已忽略</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>文件系统访问错误</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>错误</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>未知</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>正在下载</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>正在上传</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>删除</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>移动</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>忽略</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>错误</translation> </message> @@ -2869,52 +2953,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>状态未定义</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>等待同步启动</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>同步运行中</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>同步成功</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>同步错误</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>关闭</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>正在准备同步</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>正在撤销...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>同步被暂停</translation> </message> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 78c3525b5..4bbb4cc9f 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -30,27 +30,27 @@ <translation>表單</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="128"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>選擇一個遠端的目標資料夾</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="140"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> <source>Create Folder</source> <translation>建立資料夾</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="160"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>重新整理</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="174"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>資料夾</translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="107"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> <translation>文字標籤</translation> </message> @@ -134,96 +134,96 @@ <translation>繼續</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="338"/> + <location filename="../src/gui/accountsettings.cpp" line="334"/> <source>Confirm Folder Remove</source> <translation>資料夾移除確認</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="339"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>您確定要停止同步資料夾<i>%1</i>?</p><p><b>注意:</b> 這不會從您的裝置移除檔案。</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="375"/> + <location filename="../src/gui/accountsettings.cpp" line="371"/> <source>Confirm Folder Reset</source> <translation>資料夾重設確認</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="376"/> + <location filename="../src/gui/accountsettings.cpp" line="372"/> <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="486"/> + <location filename="../src/gui/accountsettings.cpp" line="482"/> <source>Sync Running</source> <translation>正在同步中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="487"/> + <location filename="../src/gui/accountsettings.cpp" line="483"/> <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="610"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>Discovering '%1'</source> <translation>正在檢索 '%1'</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="650"/> + <location filename="../src/gui/accountsettings.cpp" line="646"/> <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source> <extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="652"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="660"/> + <location filename="../src/gui/accountsettings.cpp" line="656"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="675"/> + <location filename="../src/gui/accountsettings.cpp" line="671"/> <source>%1 of %2, file %3 of %4 Total time left %5</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="681"/> + <location filename="../src/gui/accountsettings.cpp" line="677"/> <source>file %1 of %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="769"/> + <location filename="../src/gui/accountsettings.cpp" line="766"/> <source>%1 (%3%) of %2 server space in use.</source> <translation>已使用 %2 中的 %1 (%3%) 伺服器空間。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="773"/> + <location filename="../src/gui/accountsettings.cpp" line="770"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="806"/> + <location filename="../src/gui/accountsettings.cpp" line="803"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="809"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="810"/> <source>No connection to %1 at <a href="%2">%3</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="820"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>No %1 connection configured.</source> <translation>沒有 %1 連線設置。</translation> </message> @@ -256,12 +256,12 @@ Total time left %5</source> <translation>憑證密碼：</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Select a certificate</source> <translation>選擇一個憑證</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="23"/> + <location filename="../src/gui/addcertificatedialog.cpp" line="37"/> <source>Certificate files (*.p12 *.pfx)</source> <translation>憑證檔案 (*.p12 *.pfx)</translation> </message> @@ -292,33 +292,38 @@ Total time left %5</source> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="63"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="62"/> <source>No ownCloud account configured</source> <translation>沒有設置 ownCloud 帳號</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="86"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="118"/> <source>The configured server for this client is too old</source> <translation>設置的伺服器對這個客戶端來說太舊了</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="87"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="119"/> <source>Please update to the latest server and restart the client.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="106"/> - <location filename="../src/libsync/connectionvalidator.cpp" line="113"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/connectionvalidator.cpp" line="146"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="154"/> <source>Unable to connect to %1</source> <translation>無法連線到 %1</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="114"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation>逾時</translation> </message> <message> - <location filename="../src/libsync/connectionvalidator.cpp" line="147"/> + <location filename="../src/libsync/connectionvalidator.cpp" line="186"/> <source>The provided credentials are not correct</source> <translation type="unfinished"/> </message> @@ -326,30 +331,38 @@ Total time left %5</source> <context> <name>OCC::DeleteJob</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="41"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="42"/> <source>Connection timed out</source> <translation>連線逾時</translation> </message> </context> <context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="420"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="107"/> + <location filename="../src/gui/folder.cpp" line="108"/> <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="162"/> + <location filename="../src/gui/folder.cpp" line="163"/> <source>Local folder %1 does not exist.</source> <translation>本地資料夾 %1 不存在</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="165"/> + <location filename="../src/gui/folder.cpp" line="166"/> <source>%1 should be a directory but is not.</source> <translation>資料夾不存在, %1 必須是資料夾</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="168"/> + <location filename="../src/gui/folder.cpp" line="169"/> <source>%1 is not readable.</source> <translation>%1 是不可讀的</translation> </message> @@ -461,62 +474,62 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="232"/> + <location filename="../src/gui/folderman.cpp" line="233"/> <source>Could not reset folder state</source> <translation>無法重置資料夾狀態</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="233"/> + <location filename="../src/gui/folderman.cpp" line="234"/> <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="1021"/> + <location filename="../src/gui/folderman.cpp" line="1019"/> <source>Undefined State.</source> <translation>未知狀態</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1024"/> + <location filename="../src/gui/folderman.cpp" line="1022"/> <source>Waits to start syncing.</source> <translation>等待啟動同步</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1027"/> + <location filename="../src/gui/folderman.cpp" line="1025"/> <source>Preparing for sync.</source> <translation>正在準備同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1030"/> + <location filename="../src/gui/folderman.cpp" line="1028"/> <source>Sync is running.</source> <translation>同步執行中</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1033"/> + <location filename="../src/gui/folderman.cpp" line="1031"/> <source>Last Sync was successful.</source> <translation>最後一次同步成功</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1038"/> + <location filename="../src/gui/folderman.cpp" line="1036"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1041"/> + <location filename="../src/gui/folderman.cpp" line="1039"/> <source>Setup Error.</source> <translation>安裝失敗</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1044"/> + <location filename="../src/gui/folderman.cpp" line="1042"/> <source>User Abort.</source> <translation>使用者中斷。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1047"/> + <location filename="../src/gui/folderman.cpp" line="1045"/> <source>Sync is paused.</source> <translation>同步已暫停</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1053"/> + <location filename="../src/gui/folderman.cpp" line="1051"/> <source>%1 (Sync is paused)</source> <translation>%1 (同步暫停)</translation> </message> @@ -543,8 +556,8 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="502"/> - <location filename="../src/gui/folderwizard.cpp" line="504"/> + <location filename="../src/gui/folderwizard.cpp" line="595"/> + <location filename="../src/gui/folderwizard.cpp" line="597"/> <source>Add Folder</source> <translation>新增資料夾</translation> </message> @@ -552,67 +565,67 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="63"/> + <location filename="../src/gui/folderwizard.cpp" line="64"/> <source>Click to select a local folder to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="67"/> + <location filename="../src/gui/folderwizard.cpp" line="68"/> <source>Enter the path to the local folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="71"/> + <location filename="../src/gui/folderwizard.cpp" line="72"/> <source>The directory alias is a descriptive name for this sync connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="100"/> + <location filename="../src/gui/folderwizard.cpp" line="101"/> <source>No valid local folder selected!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="105"/> + <location filename="../src/gui/folderwizard.cpp" line="106"/> <source>You have no permission to write to the selected folder!</source> <translation>您沒有權限來寫入被選取的資料夾!</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="129"/> + <location filename="../src/gui/folderwizard.cpp" line="130"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="134"/> + <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>An already configured folder is contained in the current entry.</source> <translation>此項目中包含了已經設定同步的資料夾</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="141"/> + <location filename="../src/gui/folderwizard.cpp" line="142"/> <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="148"/> + <location filename="../src/gui/folderwizard.cpp" line="149"/> <source>An already configured folder contains the currently entered folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="154"/> + <location filename="../src/gui/folderwizard.cpp" line="155"/> <source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="167"/> + <location filename="../src/gui/folderwizard.cpp" line="168"/> <source>The alias can not be empty. Please provide a descriptive alias word.</source> <translation>別名不能空白, 請提供一個描述性的別名</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="178"/> + <location filename="../src/gui/folderwizard.cpp" line="179"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> <translation>別名 <i>%1</i> 已被使用。 請選擇另一個別名。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="211"/> + <location filename="../src/gui/folderwizard.cpp" line="212"/> <source>Select the source folder</source> <translation>選擇來源資料夾</translation> </message> @@ -620,42 +633,47 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="258"/> + <location filename="../src/gui/folderwizard.cpp" line="268"/> <source>Create Remote Folder</source> <translation>建立遠端資料夾</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="259"/> + <location filename="../src/gui/folderwizard.cpp" line="269"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="288"/> + <location filename="../src/gui/folderwizard.cpp" line="298"/> <source>Folder was successfully created on %1.</source> <translation>資料夾成功建立在%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="296"/> + <location filename="../src/gui/folderwizard.cpp" line="309"/> + <source>Authentication failed accessing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="311"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="345"/> + <location filename="../src/gui/folderwizard.cpp" line="392"/> <source>Choose this to sync the entire account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="400"/> + <location filename="../src/gui/folderwizard.cpp" line="493"/> <source>This folder is already being synced.</source> <translation>這個資料夾已經被同步了。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="402"/> + <location filename="../src/gui/folderwizard.cpp" line="495"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="406"/> + <location filename="../src/gui/folderwizard.cpp" line="499"/> <source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source> <translation type="unfinished"/> </message> @@ -663,7 +681,7 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="537"/> <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> @@ -671,31 +689,35 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="45"/> - <location filename="../src/gui/folderwizard.cpp" line="47"/> - <source><b>Warning:</b> </source> - <translation><b>警告:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="46"/> + <source><b>Warning:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b></source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="122"/> + <location filename="../src/libsync/propagatedownload.cpp" line="123"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="129"/> + <location filename="../src/libsync/propagatedownload.cpp" line="130"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="156"/> + <location filename="../src/libsync/propagatedownload.cpp" line="157"/> <source>Server returned wrong content-range</source> <translation>伺服器回應錯誤的內容長度</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="257"/> + <location filename="../src/libsync/propagatedownload.cpp" line="262"/> <source>Connection Timeout</source> <translation>連線逾時</translation> </message> @@ -752,12 +774,12 @@ Are you sure you want to perform this operation?</source> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="400"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="398"/> <source>Enter Password</source> <translation>輸入密碼</translation> </message> <message> - <location filename="../src/libsync/creds/httpcredentials.cpp" line="401"/> + <location filename="../src/libsync/creds/httpcredentials.cpp" line="399"/> <source>Please enter %1 password for user '%2':</source> <translation>請輸入使用者 %2 的密碼 %1 :</translation> </message> @@ -831,8 +853,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="71"/> - <source>&Search: </source> - <translation>搜尋 (&S):</translation> + <source>&Search:</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="79"/> @@ -871,19 +893,19 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/gui/logbrowser.cpp" line="194"/> - <source>Could not write to log file </source> - <translation>無法寫入記錄檔</translation> + <source>Could not write to log file %1</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="148"/> + <location filename="../src/libsync/logger.cpp" line="163"/> <source>Error</source> <translation>錯誤</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="149"/> + <location filename="../src/libsync/logger.cpp" line="164"/> <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> @@ -891,7 +913,7 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::MoveJob</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="45"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="48"/> <source>Connection timed out</source> <translation>連線逾時</translation> </message> @@ -899,27 +921,27 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="256"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="257"/> <source>New Version Available</source> <translation>有新版本</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="262"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="263"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="275"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> <source>Skip this version</source> <translation>跳過這個版本</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="276"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> <source>Skip this time</source> <translation>跳過這次更新</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="277"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="278"/> <source>Get update</source> <translation>取得更新</translation> </message> @@ -1028,53 +1050,53 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="55"/> - <source>New Update Ready</source> - <translation>新的更新已就緒</translation> + <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> + <source>New %1 Update Ready</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="56"/> - <source>A new update is about to be installed. The updater may ask + <location filename="../src/gui/updater/ocupdater.cpp" line="57"/> + <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="77"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="78"/> <source>Downloading version %1. Please wait...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="79"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="80"/> <source>Version %1 available. Restart application to start the update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="81"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="82"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="83"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="84"/> <source>Could not check for new updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="85"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="86"/> <source>New version %1 available. Please use the system's update tool to install it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="87"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="88"/> <source>Checking update server...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="89"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="90"/> <source>Update status is unknown: Did not check for new updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="93"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="94"/> <source>No updates available. Your installation is at the latest version.</source> <translation type="unfinished"/> </message> @@ -1102,28 +1124,33 @@ for additional privileges during the process.</source> <translation>%1 資料夾 '%2' 與本地資料夾 '%3' 同步</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="141"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/> + <source>Sync the directory '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/> <source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="148"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/> <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>本地同步資料夾</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="279"/> <source>Update advanced setup</source> <translation>更新進階設定</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="298"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -1141,7 +1168,7 @@ for additional privileges during the process.</source> <translation>請輸入使用者憑證</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="164"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="163"/> <source>Update user credentials</source> <translation>更新使用者憑證</translation> </message> @@ -1183,129 +1210,139 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="161"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="164"/> <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="185"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="188"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="193"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="196"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>從 %2 嘗試連線到 %1 逾時。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="204"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="207"/> <source>Trying to connect to %1 at %2...</source> <translation>嘗試連線到%1從%2</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="253"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> + <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="261"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="300"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <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="277"/> - <source>Creating local sync folder %1... </source> - <translation>建立本地同步資料夾 %1</translation> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/> + <source>Creating local sync folder %1...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/> <source>failed.</source> <translation>失敗</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/> <source>Could not create local folder %1</source> <translation>無法建立本地資料夾 %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> <source>No remote folder specified!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>Error: %1</source> <translation>錯誤： %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/> <source>creating folder on ownCloud: %1</source> <translation>在 ownCloud 建立資料夾： %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/> <source>Remote folder %1 created successfully.</source> <translation>遠端資料夾%1建立成功!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>遠端資料夾%1已存在,連線同步中</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="351"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <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="353"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/> <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="356"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> <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="361"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <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="378"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/> <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="383"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Successfully connected to %1!</source> <translation>成功連接到 %1 ！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>無法建立連線%1, 請重新檢查</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> <source>Folder rename failed</source> <translation>重新命名資料夾失敗</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>本地同步資料夾 %1 建立成功!</b></font></translation> </message> @@ -1344,7 +1381,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PUTFileJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="76"/> + <location filename="../src/libsync/propagateupload.cpp" line="93"/> <source>Connection Timeout</source> <translation>連線逾時</translation> </message> @@ -1352,7 +1389,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="121"/> + <location filename="../src/libsync/propagateupload.cpp" line="143"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"/> </message> @@ -1388,17 +1425,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFileQNAM</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="271"/> + <location filename="../src/libsync/propagatedownload.cpp" line="287"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="429"/> + <location filename="../src/libsync/propagatedownload.cpp" line="462"/> <source>The file could not be downloaded completely.</source> <translation>檔案下載無法完成。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="465"/> + <location filename="../src/libsync/propagatedownload.cpp" line="498"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -1406,17 +1443,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="81"/> - <source>; Restoration Failed: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/> + <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="104"/> - <source>Continue blacklisting: </source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/> + <source>Continue blacklisting:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="200"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/> <source>A file or directory was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -1424,12 +1461,12 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="116"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="119"/> <source>Attention, possible case sensitivity clash with %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="121"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="124"/> <source>could not create directory %1</source> <translation>無法建立目錄 %1</translation> </message> @@ -1437,17 +1474,17 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="57"/> - <source>Error removing '%1': %2; </source> + <location filename="../src/libsync/propagatorjobs.cpp" line="60"/> + <source>Error removing '%1': %2;</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="68"/> - <source>Could not remove directory '%1'; </source> - <translation>無法移除目錄 '%1':</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="71"/> + <source>Could not remove directory '%1';</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="83"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="86"/> <source>Could not remove %1 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1455,7 +1492,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="148"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="151"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation type="unfinished"/> </message> @@ -1463,44 +1500,44 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="87"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="94"/> <source>The file has been removed from a read only share. It was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="103"/> - <source>Wrong HTTP code returned by server. Expected 204, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="67"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="73"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="87"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="75"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="89"/> <source>This folder must not be renamed. Please name it back to Shared.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="111"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> <source>The file was renamed but is part of a read only share. The original file was restored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="127"/> - <source>Wrong HTTP code returned by server. Expected 201, but recieved "%1 %2".</source> + <location filename="../src/libsync/propagateremotemove.cpp" line="143"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> </context> @@ -1526,33 +1563,33 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileQNAM</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="156"/> + <location filename="../src/libsync/propagateupload.cpp" line="180"/> <source>File Removed</source> <translation>檔案已移除</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="171"/> - <location filename="../src/libsync/propagateupload.cpp" line="510"/> + <location filename="../src/libsync/propagateupload.cpp" line="194"/> + <location filename="../src/libsync/propagateupload.cpp" line="552"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="438"/> + <location filename="../src/libsync/propagateupload.cpp" line="477"/> <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="468"/> + <location filename="../src/libsync/propagateupload.cpp" line="511"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="493"/> + <location filename="../src/libsync/propagateupload.cpp" line="534"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="525"/> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> <source>The server did not acknowledge the last chunk. (No e-tag were present)</source> <translation type="unfinished"/> </message> @@ -1570,16 +1607,6 @@ It is not advisable to use it.</source> <translation>同步活動</translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="49"/> - <source>3</source> - <translation>3</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="54"/> - <source>4</source> - <translation>4</translation> - </message> - <message> <location filename="../src/gui/protocolwidget.cpp" line="50"/> <source>Time</source> <translation>時間</translation> @@ -1620,34 +1647,34 @@ It is not advisable to use it.</source> <translation>複製活動列表到剪貼簿。</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>Copied to clipboard</source> <translation>複製至剪貼簿中</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="118"/> + <location filename="../src/gui/protocolwidget.cpp" line="112"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="262"/> + <location filename="../src/gui/protocolwidget.cpp" line="256"/> <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="265"/> + <location filename="../src/gui/protocolwidget.cpp" line="259"/> <source>%n files are ignored because of previous errors. </source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/protocolwidget.cpp" line="266"/> + <location filename="../src/gui/protocolwidget.cpp" line="260"/> <source>%n files are partially downloaded. </source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="267"/> + <location filename="../src/gui/protocolwidget.cpp" line="261"/> <source>Try to sync these again.</source> <translation type="unfinished"/> </message> @@ -1655,22 +1682,22 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="306"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="360"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="318"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="373"/> <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="319"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="374"/> <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="325"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="380"/> <source>Choose What to Sync</source> <translation>選擇要同步的項目</translation> </message> @@ -1678,20 +1705,31 @@ It is not advisable to use it.</source> <context> <name>OCC::SelectiveSyncTreeView</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="36"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="59"/> <source>Loading ...</source> <translation>載入中…</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="47"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="70"/> <source>Name</source> <translation>名稱</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="48"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/> <source>Size</source> <translation>大小</translation> </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="167"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="214"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/> + <source>An error occured while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::SettingsDialog</name> @@ -1701,22 +1739,22 @@ It is not advisable to use it.</source> <translation>設定</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="72"/> + <location filename="../src/gui/settingsdialog.cpp" line="76"/> <source>Account</source> <translation>帳號</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="77"/> + <location filename="../src/gui/settingsdialog.cpp" line="81"/> <source>Activity</source> <translation>活動</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="83"/> + <location filename="../src/gui/settingsdialog.cpp" line="87"/> <source>General</source> <translation>一般</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="89"/> + <location filename="../src/gui/settingsdialog.cpp" line="93"/> <source>Network</source> <translation>網路</translation> </message> @@ -1724,27 +1762,27 @@ It is not advisable to use it.</source> <context> <name>OCC::SettingsDialogMac</name> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="63"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="66"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="67"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="70"/> <source>Account</source> <translation>帳號</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="71"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="74"/> <source>Activity</source> <translation>活動</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="75"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="78"/> <source>General</source> <translation>一般</translation> </message> <message> - <location filename="../src/gui/settingsdialogmac.cpp" line="79"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="82"/> <source>Network</source> <translation>網路</translation> </message> @@ -1757,104 +1795,139 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="26"/> - <source>Share Info</source> - <translation>分享資訊</translation> - </message> - <message> - <location filename="../src/gui/sharedialog.ui" line="34"/> - <location filename="../src/gui/sharedialog.ui" line="177"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="234"/> <source>TextLabel</source> <translation>文字標籤</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="53"/> + <location filename="../src/gui/sharedialog.ui" line="41"/> <source>share label</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>OwnCloud Path:</source> + <location filename="../src/gui/sharedialog.ui" line="63"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="182"/> + <source>Set &password </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="89"/> + <location filename="../src/gui/sharedialog.ui" line="196"/> + <source>Set &expiration date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="77"/> <source>Share link</source> <translation>分享連結</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="127"/> - <source>Set password</source> - <translation>設定密碼</translation> + <location filename="../src/gui/sharedialog.ui" line="125"/> + <source>Copy &link</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="149"/> - <source>Set expiry date</source> - <translation type="unfinished"/> + <location filename="../src/gui/sharedialog.ui" line="142"/> + <source>Set password</source> + <translation>設定密碼</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="67"/> - <location filename="../src/gui/sharedialog.cpp" line="461"/> + <location filename="../src/gui/sharedialog.cpp" line="649"/> <source>%1 path: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="68"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>%1 Sharing</source> <translation>%1 分享</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="141"/> + <location filename="../src/gui/sharedialog.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="110"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="114"/> + <source>P&assword protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Password Protected</source> <translation>密碼保護</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="299"/> + <location filename="../src/gui/sharedialog.cpp" line="341"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="447"/> + <source>Public sh&aring requires a password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="469"/> <source>Choose a password for the public link</source> <translation>為公開連結選一個密碼</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="351"/> + <location filename="../src/gui/sharedialog.cpp" line="521"/> + <location filename="../src/gui/sharedialog.cpp" line="522"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="540"/> <source>OCS API error code: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="374"/> + <location filename="../src/gui/sharedialog.cpp" line="562"/> <source>There is no sync folder configured.</source> <translation>尚未設置同步資料夾。</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="386"/> - <source>Can not find an folder to upload to.</source> + <location filename="../src/gui/sharedialog.cpp" line="574"/> + <source>Cannot find an folder to upload to.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="393"/> - <source>Sharing of external directories is not yet working.</source> + <location filename="../src/gui/sharedialog.cpp" line="596"/> + <source>A sync file with the same name exists. The file cannot be registered to sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="408"/> - <source>A sync file with the same name exists. The file can not be registered to sync.</source> + <location filename="../src/gui/sharedialog.cpp" line="641"/> + <source>The file cannot be synced.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="420"/> + <location filename="../src/gui/sharedialog.cpp" line="581"/> + <source>Sharing of external directories is not yet working.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="608"/> <source>Waiting to upload...</source> <translation>上傳等候中...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="422"/> + <location filename="../src/gui/sharedialog.cpp" line="610"/> <source>Unable to register in sync space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="453"/> - <source>The file can not be synced.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/sharedialog.cpp" line="463"/> + <location filename="../src/gui/sharedialog.cpp" line="651"/> <source>Sync of registered file was not successful yet.</source> <translation type="unfinished"/> </message> @@ -1875,30 +1948,25 @@ It is not advisable to use it.</source> <context> <name>OCC::ShibbolethWebView</name> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="55"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="62"/> <source>%1 - Authenticate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Reauthentication required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="61"/> + <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="68"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/libsync/creds/shibboleth/shibbolethwebview.cpp" line="108"/> - <source>%1 - %2</source> - <translation>%1 - %2</translation> - </message> </context> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="431"/> + <location filename="../src/gui/socketapi.cpp" line="461"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"/> @@ -1907,113 +1975,113 @@ It is not advisable to use it.</source> <context> <name>OCC::SslButton</name> <message> - <location filename="../src/gui/sslbutton.cpp" line="97"/> + <location filename="../src/gui/sslbutton.cpp" line="102"/> <source><h3>Certificate Details</h3></source> <translation><h3>憑證細節</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="100"/> + <location filename="../src/gui/sslbutton.cpp" line="105"/> <source>Common Name (CN):</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="101"/> + <location filename="../src/gui/sslbutton.cpp" line="106"/> <source>Subject Alternative Names:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="103"/> + <location filename="../src/gui/sslbutton.cpp" line="108"/> <source>Organization (O):</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="104"/> + <location filename="../src/gui/sslbutton.cpp" line="109"/> <source>Organizational Unit (OU):</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="105"/> + <location filename="../src/gui/sslbutton.cpp" line="110"/> <source>State/Province:</source> <translation>州或省:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="106"/> + <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>Country:</source> <translation>國家：</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="107"/> + <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>Serial:</source> <translation>序號:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="110"/> + <location filename="../src/gui/sslbutton.cpp" line="115"/> <source><h3>Issuer</h3></source> <translation><h3>簽發者</h3></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="113"/> + <location filename="../src/gui/sslbutton.cpp" line="118"/> <source>Issuer:</source> <translation>簽發者:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="114"/> + <location filename="../src/gui/sslbutton.cpp" line="119"/> <source>Issued on:</source> <translation>簽發於:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="115"/> + <location filename="../src/gui/sslbutton.cpp" line="120"/> <source>Expires on:</source> <translation>過期於:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="118"/> + <location filename="../src/gui/sslbutton.cpp" line="123"/> <source><h3>Fingerprints</h3></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="122"/> + <location filename="../src/gui/sslbutton.cpp" line="127"/> <source>MD 5:</source> <translation>MD 5:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="124"/> + <location filename="../src/gui/sslbutton.cpp" line="129"/> <source>SHA-256:</source> <translation>SHA-256:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="126"/> + <location filename="../src/gui/sslbutton.cpp" line="131"/> <source>SHA-1:</source> <translation>SHA-1:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="130"/> + <location filename="../src/gui/sslbutton.cpp" line="135"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> <translation><p><b>注意:</b> 此憑證已被手動核准</p></translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="150"/> + <location filename="../src/gui/sslbutton.cpp" line="155"/> <source>%1 (self-signed)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="152"/> + <location filename="../src/gui/sslbutton.cpp" line="157"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="189"/> + <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>This connection is encrypted using %1 bit %2. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="192"/> + <location filename="../src/gui/sslbutton.cpp" line="217"/> <source>Certificate information:</source> <translation>憑證資訊:</translation> </message> <message> - <location filename="../src/gui/sslbutton.cpp" line="221"/> + <location filename="../src/gui/sslbutton.cpp" line="195"/> <source>This connection is NOT secure as it is not encrypted. </source> <translation type="unfinished"/> @@ -2033,67 +2101,67 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.ui" line="44"/> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="66"/> <source>SSL Connection</source> <translation>SSL連線</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="134"/> + <location filename="../src/gui/sslerrordialog.cpp" line="135"/> <source>Warnings about current SSL Connection:</source> <translation>目前的SSL連線的警告</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="169"/> + <location filename="../src/gui/sslerrordialog.cpp" line="170"/> <source>with Certificate %1</source> <translation>與憑證 %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> <location filename="../src/gui/sslerrordialog.cpp" line="178"/> <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> <source>&lt;not specified&gt;</source> <translation>&lt;未指定&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="201"/> <source>Organization: %1</source> <translation>組織:%1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Unit: %1</source> <translation>單位:%1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="183"/> + <location filename="../src/gui/sslerrordialog.cpp" line="203"/> <source>Country: %1</source> <translation>國家:%1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>指紋 (MD5): &lt;tt&gt;%1&lt;/tt&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="191"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>指紋 (SHA1): &lt;tt&gt;%1&lt;/tt&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Effective Date: %1</source> <translation>有效日期:%1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> <source>Expiration Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Issuer: %1</source> <translation>簽發者: %1</translation> </message> @@ -2101,219 +2169,229 @@ It is not advisable to use it.</source> <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="92"/> + <location filename="../src/libsync/syncengine.cpp" line="96"/> <source>Success.</source> <translation>成功。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="95"/> + <location filename="../src/libsync/syncengine.cpp" line="99"/> <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="99"/> + <location filename="../src/libsync/syncengine.cpp" line="103"/> <source>CSync failed to load the journal file. The journal file is corrupted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="102"/> + <location filename="../src/libsync/syncengine.cpp" line="106"/> <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>用於csync的套件%1</p></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="105"/> + <location filename="../src/libsync/syncengine.cpp" line="109"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync 處理內部資料樹時發生錯誤</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="108"/> + <location filename="../src/libsync/syncengine.cpp" line="112"/> <source>CSync failed to reserve memory.</source> <translation>CSync 無法取得記憶體空間。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="111"/> + <location filename="../src/libsync/syncengine.cpp" line="115"/> <source>CSync fatal parameter error.</source> <translation>CSync 參數錯誤。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="114"/> + <location filename="../src/libsync/syncengine.cpp" line="118"/> <source>CSync processing step update failed.</source> <translation>CSync 處理步驟 "update" 失敗。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="117"/> + <location filename="../src/libsync/syncengine.cpp" line="121"/> <source>CSync processing step reconcile failed.</source> <translation>CSync 處理步驟 "reconcile" 失敗。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="120"/> + <location filename="../src/libsync/syncengine.cpp" line="124"/> <source>CSync could not authenticate at the proxy.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="123"/> + <location filename="../src/libsync/syncengine.cpp" line="127"/> <source>CSync failed to lookup proxy or server.</source> <translation>CSync 查詢代理伺服器或伺服器失敗。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="126"/> + <location filename="../src/libsync/syncengine.cpp" line="130"/> <source>CSync failed to authenticate at the %1 server.</source> <translation>CSync 於伺服器 %1 認證失敗。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="129"/> + <location filename="../src/libsync/syncengine.cpp" line="133"/> <source>CSync failed to connect to the network.</source> <translation>CSync 無法連接到網路。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="132"/> + <location filename="../src/libsync/syncengine.cpp" line="136"/> <source>A network connection timeout happened.</source> <translation>網路連線逾時。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="135"/> + <location filename="../src/libsync/syncengine.cpp" line="139"/> <source>A HTTP transmission error happened.</source> <translation>HTTP 傳輸錯誤。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="138"/> + <location filename="../src/libsync/syncengine.cpp" line="142"/> <source>CSync failed due to not handled permission deniend.</source> <translation>CSync 失敗，由於未處理的存取被拒。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="141"/> - <source>CSync failed to access </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="144"/> + <location filename="../src/libsync/syncengine.cpp" line="148"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync 試圖建立一個已經存在的目錄。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="147"/> + <location filename="../src/libsync/syncengine.cpp" line="151"/> <source>CSync: No space on %1 server available.</source> <translation>CSync：伺服器 %1 沒有可用空間。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="150"/> + <location filename="../src/libsync/syncengine.cpp" line="154"/> <source>CSync unspecified error.</source> <translation>CSync 未知的錯誤。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="153"/> + <location filename="../src/libsync/syncengine.cpp" line="157"/> <source>Aborted by the user</source> <translation>使用者中斷</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="156"/> + <location filename="../src/libsync/syncengine.cpp" line="163"/> <source>The mounted directory is temporarily not available on the server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="159"/> - <source>An error opening a directory happened</source> + <location filename="../src/libsync/syncengine.cpp" line="145"/> + <source>CSync failed to access</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="160"/> + <source>The service is temporarily unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="162"/> - <source>An internal error number %1 happened.</source> + <location filename="../src/libsync/syncengine.cpp" line="166"/> + <source>An error occurred while opening a directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="217"/> + <location filename="../src/libsync/syncengine.cpp" line="169"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="224"/> <source>The item is not synced because of previous errors: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="340"/> + <location filename="../src/libsync/syncengine.cpp" line="364"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="343"/> + <location filename="../src/libsync/syncengine.cpp" line="367"/> <source>Hard links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> + <location filename="../src/libsync/syncengine.cpp" line="370"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="349"/> + <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>File contains invalid characters that can not be synced cross platform.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="366"/> + <location filename="../src/libsync/syncengine.cpp" line="376"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="397"/> <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="567"/> + <location filename="../src/libsync/syncengine.cpp" line="602"/> <source>Unable to initialize a sync journal.</source> <translation>同步處理日誌無法初始化</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="648"/> + <location filename="../src/libsync/syncengine.cpp" line="687"/> <source>Cannot open the sync journal</source> <translation>同步處理日誌無法開啟</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="895"/> - <location filename="../src/libsync/syncengine.cpp" line="902"/> + <location filename="../src/libsync/syncengine.cpp" line="948"/> + <location filename="../src/libsync/syncengine.cpp" line="955"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="920"/> + <location filename="../src/libsync/syncengine.cpp" line="973"/> <source>Not allowed because you don't have permission to add sub-directories in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="926"/> + <location filename="../src/libsync/syncengine.cpp" line="979"/> <source>Not allowed because you don't have permission to add parent directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="933"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Not allowed because you don't have permission to add files in that directory</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="953"/> + <location filename="../src/libsync/syncengine.cpp" line="1006"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="970"/> - <location filename="../src/libsync/syncengine.cpp" line="990"/> + <location filename="../src/libsync/syncengine.cpp" line="1023"/> + <location filename="../src/libsync/syncengine.cpp" line="1043"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1003"/> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> <source>Local files and share folder removed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1058"/> + <location filename="../src/libsync/syncengine.cpp" line="1111"/> <source>Move not allowed, item restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1120"/> <source>Move not allowed because %1 is read-only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the destination</source> <translation>目標</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1068"/> + <location filename="../src/libsync/syncengine.cpp" line="1121"/> <source>the source</source> <translation>來源</translation> </message> @@ -2321,7 +2399,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="49"/> + <location filename="../src/gui/systray.cpp" line="55"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -2329,17 +2407,17 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="233"/> + <location filename="../src/libsync/theme.cpp" line="265"/> <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="237"/> + <location filename="../src/libsync/theme.cpp" line="269"/> <source><p>Copyright ownCloud, Incorporated</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="238"/> + <location filename="../src/libsync/theme.cpp" line="270"/> <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 type="unfinished"/> </message> @@ -2444,6 +2522,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Crash now</source> + <comment>Only shows in debug mode to allow testing the crash handler</comment> <translation type="unfinished"/> </message> <message> @@ -2490,7 +2569,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ownCloudTheme</name> <message utf8="true"> - <location filename="../src/libsync/owncloudtheme.cpp" line="48"/> + <location filename="../src/libsync/owncloudtheme.cpp" line="47"/> <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source> <translation type="unfinished"/> </message> @@ -2587,7 +2666,7 @@ It is not advisable to use it.</source> <translation>設定客戶端 TLS 憑證</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="18"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="35"/> <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"/> </message> @@ -2764,12 +2843,12 @@ It is not advisable to use it.</source> <context> <name>main.cpp</name> <message> - <location filename="../src/gui/main.cpp" line="45"/> + <location filename="../src/gui/main.cpp" line="38"/> <source>System Tray not available</source> <translation>系統常駐程式無法使用</translation> </message> <message> - <location filename="../src/gui/main.cpp" line="46"/> + <location filename="../src/gui/main.cpp" line="39"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1需要可運作的系統常駐程式區。若您正在執行XFCE，請參考 <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">這份教學</a>。若非如此則請安裝一個系統常駐的應用程式，如'trayer'，並再度嘗試。</translation> </message> @@ -2777,82 +2856,87 @@ It is not advisable to use it.</source> <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="220"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="251"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> </context> <context> <name>progress</name> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="31"/> <source>Downloaded</source> <translation>已下載</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Uploaded</source> <translation>已上傳</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="36"/> + <source>Downloaded, renamed conflicting file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="38"/> <source>Deleted</source> <translation>已刪除</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="40"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="41"/> <source>Moved to %1</source> <translation>搬移到 %1</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Ignored</source> <translation>已忽略</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <source>Filesystem access error</source> <translation>存取檔案系統錯誤</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="47"/> <source>Error</source> <translation>錯誤</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="49"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="52"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <source>Unknown</source> <translation>未知</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="62"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="63"/> <source>downloading</source> <translation>下載中</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="64"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="65"/> <source>uploading</source> <translation>上傳中</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="67"/> <source>deleting</source> <translation>刪除中</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="69"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> <source>moving</source> <translation>搬移中</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="71"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="72"/> <source>ignoring</source> <translation>忽略中</translation> </message> <message> - <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> - <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="74"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="76"/> <source>error</source> <translation>錯誤</translation> </message> @@ -2860,52 +2944,52 @@ It is not advisable to use it.</source> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="54"/> + <location filename="../src/libsync/theme.cpp" line="56"/> <source>Status undefined</source> <translation>未定義的狀態</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="57"/> + <location filename="../src/libsync/theme.cpp" line="59"/> <source>Waiting to start sync</source> <translation>等待開始同步</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="60"/> + <location filename="../src/libsync/theme.cpp" line="62"/> <source>Sync is running</source> <translation>同步中</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="63"/> + <location filename="../src/libsync/theme.cpp" line="65"/> <source>Sync Success</source> <translation>同步完成</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="66"/> + <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync Success, some files were ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="69"/> + <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Error</source> <translation>同步失敗</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="72"/> + <location filename="../src/libsync/theme.cpp" line="74"/> <source>Setup Error</source> <translation>安裝錯誤</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="75"/> + <location filename="../src/libsync/theme.cpp" line="77"/> <source>Preparing to sync</source> <translation>正在準備同步。</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="78"/> + <location filename="../src/libsync/theme.cpp" line="80"/> <source>Aborting...</source> <translation>中斷中…</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="81"/> + <location filename="../src/libsync/theme.cpp" line="83"/> <source>Sync is paused</source> <translation>同步已暫停</translation> </message> |