diff options
| author | Mr. Jenkins <jenkins@owncloud.org> | 2013-11-27 20:20:43 +0400 |
|---|---|---|
| committer | Mr. Jenkins <jenkins@owncloud.org> | 2013-11-27 20:20:43 +0400 |
| commit | 4626ef1ffb7498d274d2c48975055d787943e54f (patch) | |
| tree | 93235a1add304da1312f4cf36ad4d341cd32047a | |
| parent | 23007613a90a65e8997e9e6350e15b6c49655326 (diff) | |
[tx-robot] updated from transifex
28 files changed, 2354 insertions, 4977 deletions
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index 011b2a642..bd997314e 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Pausa</translation> </message> @@ -104,127 +104,130 @@ <translation>Afegeix carpeta...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Informació...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Ús de l'emmagatzemament</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Obtenint informació de l'ús...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Nota</b> Algunes carpetes, incloent els fitxers muntats a través de xarxa o compartits, poden tenir límits diferents.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Continua</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Confirma l'eliminació de la carpeta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Confirmeu la reinicialització de la carpeta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>La connexió %1 no està configurada.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>S'està sincronitzant</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Connectat a <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Comença</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Actualment</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Copletament</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 de %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Completament acabat.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 de %2, fitxer %3 de %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation>Actualment no hi ha informació disponible de l'ús d'emmagatzemament.</translation> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync ha fallat en no implementar el permís denegat.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync ha fallat en trobar un fitxer específic.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync ha intentat crear una carpeta que ja existeix.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>S'ha produït un error en la transmissió HTTP.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Aturat per l'usuari</translation> @@ -1257,13 +1260,13 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1276,153 +1279,62 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a <translation>Formulari</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Hora</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Fitxer</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Carpeta</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Acció</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Mida</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Copia</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Ordena els enllaços ignorats</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>Els enllaços febles trenquen la semàntica de la sincronització. -No els useu en carpetes sincronitzades</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>fitxer</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>directori</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>%1 ha estat ignorat perquè està a la llista d'ignorats del client -o el nom %1 conté caràcters que no són sincronitzables -en un entorn multiplataforma</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Element ignorat</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 a la llista d'ignorats</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>%1 s'ha omès perquè consta a la llista del client -de noms a ignorar</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Caràcters no vàlids</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>El nom %1 conté un o més caràcters no vàlids que trenquen -la sincronització en un entorn multiplataforma</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Fitxer en conflicte</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>El fitxer ha canviat en el servidor i en el dipòsit local i com a resultat ha -generat un conflicte. El canvi local s'ha copiat en el fitxer conflicte -mentre que el fitxer del servidor està disponible amb el nom -original</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>S'ha copiat al porta-retalls</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>No hi ha més espai disponible en el servidor.</translation> </message> @@ -1602,127 +1514,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 Sincronització iniciada</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>la sincronització ha començat per la carpeta %1 configurada().</numerusform><numerusform>la sincronització ha començat per les carpetes %1 configurade(s).</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Carpeta %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>No hi ha fitxers de sincronització configurats</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Cap.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Canvis recents</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Obre la carpeta %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Fitxers gestionats:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Obre carpeta '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Obre %1 en el navegador</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Calculant la quota...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Estat desconegut</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Arranjament...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Detalls...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Surt %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Quota n/d</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1 de %2 en ús</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>No hi ha elements sincronitzats recentment</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Sincronitzant %1 de %2 (%3 de %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Actualitzat</translation> </message> @@ -1995,7 +1897,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -2003,7 +1905,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>No s'ha pogut esborrar la carpeta %1</translation> </message> @@ -2210,8 +2112,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Error de sincronització - Feu clic al botó per més detalls.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index 271628db0..88c9f195f 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -80,7 +80,7 @@ <message> <location filename="../src/mirall/accountsettings.ui" line="46"/> <source>Account to Synchronize</source> - <translation type="unfinished"/> + <translation>Účet k synchronizaci</translation> </message> <message> <location filename="../src/mirall/accountsettings.ui" line="52"/> @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Pozastavit</translation> </message> @@ -104,127 +104,130 @@ <translation>Přidat složku...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Info...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Obsazený prostor</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Zjišťuji obsazený prostor...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Poznámka:</b> Některé složky, včetně síťových či sdílených složek, mohou mít jiné limity.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Obnovit</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Potvrdit odstranění složky</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Potvrdit restartování složky</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Žádné spojení s %1 nenastaveno.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Synchronizace probíhá</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> - <translation type="unfinished"/> + <translation>Žádný účet nenastaven.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> - <translation type="unfinished"/> + <translation>%1 z %2 v užívání.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Připojeno k <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Spuštění</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Aktuálně</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Úplně</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 z %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Úplně dokončeno.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 z %2, soubor %3 z %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> - <translation type="unfinished"/> + <translation>Připojeno k <a href="%1">%2</a> jako <i>%3</i>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> - <translation type="unfinished"/> + <translation>Žádné spojení s <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <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> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync selhalo z důvodu nezpracovaného odmítnutí práv.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync se nezdařilo najít požadovaný soubor.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync se pokusilo vytvořit adresář, který již existuje.</translation> @@ -355,12 +353,12 @@ <message> <location filename="../src/mirall/csyncthread.cpp" line="228"/> <source>The item is not synced because it is on the blacklist.</source> - <translation type="unfinished"/> + <translation>Položka nebyla synchronizována, protože je na černé listině.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> - <translation type="unfinished"/> + <translation>Nemohu inicializovat synchronizační list.</translation> </message> <message> <location filename="../src/mirall/csyncthread.cpp" line="149"/> @@ -378,6 +376,11 @@ <translation>Nastala chyba HTTP přenosu.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Zrušeno uživatelem</translation> @@ -393,7 +396,7 @@ <message> <location filename="../src/mirall/connectionvalidator.cpp" line="90"/> <source>No ownCloud account configured</source> - <translation type="unfinished"/> + <translation>Žádný účet ownCloud nenastaven</translation> </message> <message> <location filename="../src/mirall/connectionvalidator.cpp" line="105"/> @@ -452,37 +455,37 @@ <message> <location filename="../src/mirall/folder.cpp" line="386"/> <source>downloaded</source> - <translation type="unfinished"/> + <translation>staženo</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="387"/> <source>removed</source> - <translation type="unfinished"/> + <translation>odstraněno</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="388"/> <source>updated</source> - <translation type="unfinished"/> + <translation>aktualizováno</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="389"/> <source>renamed</source> - <translation type="unfinished"/> + <translation>přejmenováno</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="401"/> <source>'%1' has been %2.</source> - <translation type="unfinished"/> + <translation>'%1' byl %2.</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="403"/> <source>Files %1</source> - <translation type="unfinished"/> + <translation>Soubory %1</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="404"/> <source>'%1' and %2 other files have been %3.</source> - <translation type="unfinished"/> + <translation> '%1' a %2 dalších souborů bylo %3.</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="446"/> @@ -629,7 +632,7 @@ dokumentací pro možnost opravy.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="92"/> <source>No valid local folder selected!</source> - <translation type="unfinished"/> + <translation>Nebyla vybrána místní složka!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="97"/> @@ -639,17 +642,17 @@ dokumentací pro možnost opravy.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="121"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> - <translation type="unfinished"/> + <translation>Cesta %1 je již nastavena jako adresář pro odesílání.<br/>Zvolte, prosím, jinou!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="133"/> <source>The selected folder is a symbolic link. An already configuredfolder is contained in the folder this link is pointing to.</source> - <translation type="unfinished"/> + <translation>Označená složka je symbolický odkaz. Cílová složka tohoto odkazu již obsahuje nastavenou složku. </translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="140"/> <source>An already configured folder contains the currently entered folder.</source> - <translation type="unfinished"/> + <translation>Nastavená složka již obsahuje právě zadaný adresář.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="146"/> @@ -659,7 +662,7 @@ dokumentací pro možnost opravy.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="170"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> - <translation type="unfinished"/> + <translation>Alias <i>%1</i> je již používán. Zvolte prosím jiný.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="126"/> @@ -697,17 +700,17 @@ dokumentací pro možnost opravy.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="264"/> <source>Failed to create the folder on %1. Please check manually.</source> - <translation type="unfinished"/> + <translation>Na %1 selhalo vytvoření složky. Zkontrolujte to, prosím ručně.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="368"/> <source>This folder is already being synced.</source> - <translation type="unfinished"/> + <translation>Tato složka je již synchronizována.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="374"/> <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>Již synchronizujete všechny vaše soubory. Synchroniyování další složky <b>není</b> podporováno. Pokud chcete synchronizovat více složek, tak odstraňte, prosím, synchronizaci kořenové složky.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="313"/> @@ -726,7 +729,7 @@ dokumentací pro možnost opravy.</translation> <location filename="../src/mirall/folderwizard.cpp" line="43"/> <location filename="../src/mirall/folderwizard.cpp" line="45"/> <source><b>Warning:</b> </source> - <translation type="unfinished"/> + <translation><b>Varování:</b> </translation> </message> </context> <context> @@ -739,7 +742,7 @@ dokumentací pro možnost opravy.</translation> <message> <location filename="../src/mirall/generalsettings.ui" line="20"/> <source>General Setttings</source> - <translation type="unfinished"/> + <translation>Základní nastavení</translation> </message> <message> <location filename="../src/mirall/generalsettings.ui" line="26"/> @@ -768,12 +771,12 @@ dokumentací pro možnost opravy.</translation> <message> <location filename="../src/creds/httpcredentials.cpp" line="241"/> <source>Enter Password</source> - <translation type="unfinished"/> + <translation>Zadejte heslo</translation> </message> <message> <location filename="../src/creds/httpcredentials.cpp" line="242"/> <source>Please enter %1 password for user '%2':</source> - <translation type="unfinished"/> + <translation>Zadejte prosím %1 heslo pro uživatele '%2': </translation> </message> </context> <context> @@ -1153,12 +1156,12 @@ Zvolené položky budou smazány také v případě, že brání smazání adres <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/> <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/> <source>Failed to connect to %1 at %2:<br/>%3</source> - <translation type="unfinished"/> + <translation>Selhalo spojení s %1 v %2:<br/>%3</translation> </message> <message> <location filename="../src/mirall/owncloudsetupwizard.cpp" line="264"/> <source>No remote folder specified!</source> - <translation type="unfinished"/> + <translation>Žádná vzdálená složka nenastavena.</translation> </message> <message> <location filename="../src/mirall/owncloudsetupwizard.cpp" line="270"/> @@ -1257,15 +1260,15 @@ Zvolené položky budou smazány také v případě, že brání smazání adres <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> - <translation type="unfinished"/> + <translation>Lokální soubor byl změněn během synchronizace, bude synchronizán, jakmile bude kompletní</translation> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> - <translation type="unfinished"/> + <translation>Synchronizace zrušena uživatelem.</translation> </message> </context> <context> @@ -1276,153 +1279,62 @@ Zvolené položky budou smazány také v případě, že brání smazání adres <translation>Formulář</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> - <translation type="unfinished"/> + <translation>Podrobný protokol synchronizace</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>Textový popisek</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Čas</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Soubor</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Složka</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Akce</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Velikost</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Kopie</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Symbolický odkaz ignorován</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>Symbolické odkazy narušují sémantiku synchronizace. -Prosím, nepoužívejte je v synchronizovaných adresářích</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>soubor</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>adresář</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>Položka %1 byla ignorována, jelikož je na klientském seznamu ignorovaných -nebo název %1 obsahuje znaky nesynchronizovatelné -v prostředí více platforem</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Položka ignorována</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 na seznamu ignorovaných</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>Položka %1 byla přeskočena, protože je na seznamu -ignorovaných jmen klienta</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Neplatné znaky</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>Název %1 obsahuje alespoň jeden neplatný znak, který narušuje -synchronizaci v prostředí více platforem</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Soubor s konfliktem.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>Soubor byl změněn na serveru i na lokálním disku, na základě čehož -byl vytvořen tzv. soubor s konfliktem. Změny v lokálním souboru budou -zkopírovány do souboru s konfliktem, přičemž soubor ze serveru bude -dostupný pod původním názvem</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Zkopírováno do schránky</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> - <translation type="unfinished"/> + <translation>Protokol synchronizace byl zkopírován do schránky.</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>Na serveru již není k dispozici volné místo.</translation> </message> @@ -1465,23 +1377,24 @@ dostupný pod původním názvem</translation> <message> <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/> <source>%1 - Authenticate</source> - <translation type="unfinished"/> + <translation>%1 - ověření</translation> </message> <message> <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/> <source>%1 - %2</source> - <translation type="unfinished"/> + <translation>%1 - %2</translation> </message> <message> <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/> <source>Error loading IdP login page</source> - <translation type="unfinished"/> + <translation>Chyba při načítání přihlašovací stránky IdP</translation> </message> <message> <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/> <source>Could not load Shibboleth login page to log you in. Please ensure that your network connection is working.</source> - <translation type="unfinished"/> + <translation>Nemohu načíst přihlašovací stránku Shibboleth potřebnou pro přihlášení. +Ujistěte se, prosím, že síťové spojení funguje.</translation> </message> </context> <context> @@ -1568,7 +1481,7 @@ Please ensure that your network connection is working.</source> <message> <location filename="../src/mirall/systray.cpp" line="49"/> <source>%1: %2</source> - <translation type="unfinished"/> + <translation>%1: %2</translation> </message> </context> <context> @@ -1602,127 +1515,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>Synchronizace %1 zahájena</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Synchronizace spuštěna pro %1 nastavený adresář(e).</numerusform><numerusform>Synchronizace spuštěna pro %1 nastavené adresář(e).</numerusform><numerusform>Synchronizace spuštěna pro %1 nastavených adresář(ů).</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> - <translation type="unfinished"/> + <translation>Přihlašte se prosím</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Složka %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Nejsou nastaveny žádné synchronizované složky.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Nic.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Poslední změny</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Otevřít složku %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Spravované složky:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Otevřít složku '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Otevřít %1 v prohlížeči</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Počítám kvóty...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Neznámý stav</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Nastavení...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Podrobnosti...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Nápověda</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Ukončit %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> - <translation type="unfinished"/> + <translation>Přihlásit...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> - <translation type="unfinished"/> + <translation>Odhlásit</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Kvóta nedostupná</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1% z %2 v používání</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Žádné položky nebyly nedávno synchronizovány</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Synchronizuji %1 z %2 (%3 z %4)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Aktuální</translation> </message> @@ -1995,15 +1898,15 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> - <translation type="unfinished"/> + <translation>nepodařilo se vytvořit složku %1</translation> </message> </context> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>Nepodařilo se odstranit adresář %1</translation> </message> @@ -2013,12 +1916,12 @@ Please ensure that your network connection is working.</source> <message> <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/> <source>This folder must not be renamed. It is renamed back to its original name.</source> - <translation type="unfinished"/> + <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/mirall/owncloudpropagator.cpp" line="878"/> <source>This folder must not be renamed. Please name it back to Shared.</source> - <translation type="unfinished"/> + <translation>Tato složka nemůže být přejmenována. Přejmenujte jí prosím zpět na Shared.</translation> </message> </context> <context> @@ -2134,7 +2037,7 @@ Please ensure that your network connection is working.</source> <location filename="../src/mirall/progressdispatcher.cpp" line="62"/> <location filename="../src/mirall/progressdispatcher.cpp" line="65"/> <source>Move</source> - <translation type="unfinished"/> + <translation>Přesunout</translation> </message> <message> <location filename="../src/mirall/progressdispatcher.cpp" line="80"/> @@ -2173,12 +2076,12 @@ Please ensure that your network connection is working.</source> <message> <location filename="../src/mirall/progressdispatcher.cpp" line="116"/> <source>move</source> - <translation type="unfinished"/> + <translation>přesunout</translation> </message> <message> <location filename="../src/mirall/progressdispatcher.cpp" line="119"/> <source>moved</source> - <translation type="unfinished"/> + <translation>přesunut</translation> </message> </context> <context> @@ -2210,8 +2113,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Chyba synchronizace - klikněte na informační tlačítko pro podrobnosti.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index 29fe9d4fb..d80bc91be 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -80,7 +80,7 @@ <message> <location filename="../src/mirall/accountsettings.ui" line="46"/> <source>Account to Synchronize</source> - <translation type="unfinished"/> + <translation>Konten zum Synchronisieren</translation> </message> <message> <location filename="../src/mirall/accountsettings.ui" line="52"/> @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Anhalten</translation> </message> @@ -104,128 +104,131 @@ <translation>Ordner hinzufügen...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Info...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Speicherbelegung</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Nutzungsinformationen werden abgerufen ...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Hinweis:</b> Einige Ordner, einschließlich über das Netzwerk verbundene oder freigegebene Ordner, können unterschiedliche Beschränkungen haben.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Fortsetzen</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Löschen des Ordners bestätigen</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Zurücksetzen des Ordners bestätigen</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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 Klient 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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Keine %1-Verbindung konfiguriert.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Synchronisation läuft</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation>Kein Konto konfiguriert.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation>%1 von %2 (%3%) benutzt.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Verbunden mit <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Start</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Gegenwärtig</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Vollständig</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 von %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Vollständig abgeschlossen.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 of %2, Datei %3 von %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <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/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation>Keine Verbindung mit %1 zu <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -333,11 +336,6 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf <translation>CSync wegen fehlender Berechtigung fehlgeschlagen.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync konnte eine bestimmte Datei nicht finden.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync versuchte, ein Verzeichnis zu erstellen, welches bereits existiert.</translation> @@ -356,10 +354,10 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf <message> <location filename="../src/mirall/csyncthread.cpp" line="228"/> <source>The item is not synced because it is on the blacklist.</source> - <translation type="unfinished"/> + <translation>Das Element wurde nicht synchronisiert, da es auf der schwarzen Liste steht.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation> </message> @@ -379,6 +377,11 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf <translation>Es hat sich ein HTTP-Übertragungsfehler ereignet.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Abbruch durch den Benutzer</translation> @@ -630,7 +633,7 @@ Dokumentation für mögliche Lösungen.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="92"/> <source>No valid local folder selected!</source> - <translation type="unfinished"/> + <translation>Keinen gültigen lokales Ordner gewählt!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="97"/> @@ -640,27 +643,27 @@ Dokumentation für mögliche Lösungen.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="121"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> - <translation type="unfinished"/> + <translation>Das lokale Verzeichnis %1 ist bereits ein Verzeichnis zum Hochladen. Bitte wählen Sie ein anderes Verzeichnis!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="133"/> <source>The selected folder is a symbolic link. An already configuredfolder is contained in the folder this link is pointing to.</source> - <translation type="unfinished"/> + <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/mirall/folderwizard.cpp" line="140"/> <source>An already configured folder contains the currently entered folder.</source> - <translation type="unfinished"/> + <translation>Ein bereits konfigurierter Ordner beinhaltet den aktuell eingegebenen Ordner.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="146"/> <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>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/mirall/folderwizard.cpp" line="170"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> - <translation type="unfinished"/> + <translation>Der Alias <i>%1</i> wird bereits benutzt. Bitte wählen Sie einen anderen Alias.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="126"/> @@ -698,17 +701,17 @@ Dokumentation für mögliche Lösungen.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="264"/> <source>Failed to create the folder on %1. Please check manually.</source> - <translation type="unfinished"/> + <translation>Die Erstellung des Ordners auf %1 ist fehlgeschlagen. Bitte prüfen Sie dies manuell.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="368"/> <source>This folder is already being synced.</source> - <translation type="unfinished"/> + <translation>Dieser Ordner wird bereits synchronisiert.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="374"/> <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>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> <message> <location filename="../src/mirall/folderwizard.cpp" line="313"/> @@ -727,7 +730,7 @@ Dokumentation für mögliche Lösungen.</translation> <location filename="../src/mirall/folderwizard.cpp" line="43"/> <location filename="../src/mirall/folderwizard.cpp" line="45"/> <source><b>Warning:</b> </source> - <translation type="unfinished"/> + <translation><b>Warnung:</b> </translation> </message> </context> <context> @@ -769,12 +772,12 @@ Dokumentation für mögliche Lösungen.</translation> <message> <location filename="../src/creds/httpcredentials.cpp" line="241"/> <source>Enter Password</source> - <translation type="unfinished"/> + <translation>Passwort eingeben</translation> </message> <message> <location filename="../src/creds/httpcredentials.cpp" line="242"/> <source>Please enter %1 password for user '%2':</source> - <translation type="unfinished"/> + <translation>Bitte %1 Passwort für den Nutzer '%2' eingeben:</translation> </message> </context> <context> @@ -1258,15 +1261,15 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation>Eine lokale Datei wurde während der Synchronisation geändert, synchronisieren Sie nochmals sobald die aktuelle Datei vollständig angekommen ist</translation> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> - <translation type="unfinished"/> + <translation>Synchronisation wurde durch den Nutzer abgebrochen.</translation> </message> </context> <context> @@ -1277,150 +1280,62 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve <translation>Formular</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation>Detaillierter Synchronisationsstatus</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>Textfeld</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Zeit</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Datei</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Ordner</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Aktion</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Größe</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Symbolische Verknüpfung ignoriert</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>Softlinks zerstören die Semantik beim synchronisieren. -Verwenden Sie daher keine Softlinks in ihrem zu synchronisierenden Ordnern.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>Datei</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>Verzeichnis</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>Die %1 wurde ignoriert, da sie entweder auf der Ignore-Liste des Klienten steht -oder der %1 Zeichen enthält, welche nicht über verschiedene Plattformen -synchronisiert werden können</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Eintrag ignoriert</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 auf der Ignorierliste</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>Die %1 wurde übersprungen, da der Name auf Klienten-Seite -in eine Ignorierliste eingetragen ist</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Ungültige Zeichen</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>Der %1 - Name enthält ein oder mehrere ungültige Zeichen, die das -synchronisieren in einer plattformübergreifenden Umgebung verhindern</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Konfliktdatei.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>Die Datei wurde sowohl auf dem Server als auch im lokalen Repository geändert und verursacht somit einen Konflikt. Die lokalen Änderungen wurden in die Konflikt-Datei kopiert während die Änderungen vom Server in der Datei mit dem Original-Namen zu finden sind.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>In die Zwischenablage kopiert</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <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/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>Auf dem Server ist kein Speicherplatz mehr vorhanden.</translation> </message> @@ -1567,7 +1482,7 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio <message> <location filename="../src/mirall/systray.cpp" line="49"/> <source>%1: %2</source> - <translation type="unfinished"/> + <translation>%1: %2</translation> </message> </context> <context> @@ -1601,127 +1516,117 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 Sync gestartet</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Synchronisation wurde für %n konfigurierten Sync-Ordner gestartet.</numerusform><numerusform>Synchronisation wurde für %n konfigurierte Sync-Ordner gestartet.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> - <translation type="unfinished"/> + <translation>Bitte melden Sie sich an</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Ordner %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Keine Sync-Ordner konfiguriert.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Keine.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Letzte Änderungen</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Ordner %1 öffnen</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Verwaltete Ordner:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Ordner '%1' öffnen</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>%1 im Browser öffnen</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Berechne Quote...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Unbekannter Status</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Details...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>%1 beenden</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> - <translation type="unfinished"/> + <translation>Anmeldung...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> - <translation type="unfinished"/> + <translation>Abmeldung</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Quote unbekannt</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1% von %2 benutzt</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Keine kürzlich synchronisierten Elemente</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Synchronisiere %1 von %2 (%3 von %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Aktuell</translation> </message> @@ -1994,7 +1899,7 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation>Verzeichnis %1 konnte nicht erstellt werden</translation> </message> @@ -2002,7 +1907,7 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>Verzeichnis %1 konnte nicht entfernt werden</translation> </message> @@ -2209,8 +2114,8 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Sync-Fehler - Klicken Sie auf den Info-Knopf für weitere Informationen</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index e6bf3b837..d8d6a9611 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Παύση</translation> </message> @@ -104,127 +104,130 @@ <translation>Προσθήκη φακέλου...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Πληροφορίες...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Χρήση Αποθηκευτικού Χώρου</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Λήψη πληροφοριών χρήσης...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Συνέχεια</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Επιβεβαίωση αφαίρεσης φακέλου</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Επιβεβαίωση Επαναφοράς Φακέλου</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Ο Συγχρονισμός Εκτελείται</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Η λειτουργία συγχρονισμού λειτουργεί.<br/> Θέλετε να την τερματίσετε;</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Συνδεδεμένοι με <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Έναρξη</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 από %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 από %2, αρχείο %3 από %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync απέτυχε λόγω μη γίνεται deniend άδεια. </translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>Το CSync απέτυχε να βρει ένα συγκεκριμένο αρχείο. </translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>Το CSync προσπαθησε να δημιουργησει εναν χωρο αποθηκευσης που υπηρχε ηδη.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>Ένα σφάλμα μετάδοσης HTTP συνέβη.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Ματαιώθηκε από το χρήστη</translation> @@ -1254,13 +1257,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1273,148 +1276,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Φόρμα</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Ώρα</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Αρχείο</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Φάκελος</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Ενέργεια</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Μέγεθος</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Αντιγραφή</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>αρχείο</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>κατάλογος</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>Το %1 αγνοήθηκε γιατί βρίσκεται στη λίστα αγνόησης του δέκτη -ή το όνομα του %1 περιέχει χαρακτήρες που δεν μπορούν να συγχρονιστούν -με τρόπο συμβατό με πολλαπλές πλατφόρμες</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Στοιχείο αγνοήθηκε</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 περιέχεται στη λίστα προς αγνόηση</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>Το %1 παραλήφθηκε γιατί βρίσκεται στη λίστα ονομάτων -του δέκτη προς αγνόηση</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Μη έγκυροι χαρακτήρες</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Αρχείο υπό διένεξη.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Αντιγραφθηκε στο clipboard</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation type="unfinished"/> </message> @@ -1594,127 +1511,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 Ο συγχρονισμος ξεκινησε</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Ο συγχρονισμός ξεκίνησε για n% ρυθμισμένο(υς) φάκελο(υς).</numerusform><numerusform>Ο συγχρονισμός ξεκίνησε για n% ρυθμισμένο(υς) φάκελο(υς).</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Φάκελος %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Δεν έχουν οριστεί φάκελοι συγχρονισμού.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Πρόσφατες Αλλαγές</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Άνοιγμα %1 φακέλου</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Διαχείριση αρχείων:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Άνοιγμα καταλόγου '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Άνοιγμα %1 στον περιηγητή</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Υπολογισμός μεριδίου χώρου αποθήκευσης...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Άγνωστη κατάσταση</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Ρυθμίσεις...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Λεπτομέρειες...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Βοήθεια</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Κλείσιμο %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Μερίδιο χώρου αποθήκευσης δεν είναι διαθέσιμο</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1% από %2 σε χρήση</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Συγχρονισμός %1 από %2 (%3 από %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Ενημερωμένο</translation> </message> @@ -1987,7 +1894,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1995,7 +1902,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation type="unfinished"/> </message> @@ -2224,8 +2131,8 @@ Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc. </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Σφάλμα στην ενημέρωση - Κάντε click για λεπτομέρειες. </translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index 3d08cbb1c..af90cfdf6 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -91,7 +91,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation type="unfinished"></translation> </message> @@ -106,127 +106,130 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -334,11 +337,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation type="unfinished"></translation> @@ -360,7 +358,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"></translation> </message> @@ -380,6 +378,11 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation type="unfinished"></translation> @@ -1252,13 +1255,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"></translation> </message> @@ -1271,145 +1274,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation type="unfinished"></translation> </message> @@ -1589,130 +1509,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation type="unfinished"></translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> - </translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation type="unfinished"></translation> </message> @@ -1985,7 +1892,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"></translation> </message> @@ -1993,7 +1900,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation type="unfinished"></translation> </message> @@ -2200,7 +2107,7 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> + <source>Sync Error</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index f66f41a34..0568045df 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Pausar</translation> </message> @@ -104,127 +104,130 @@ <translation>Agregar carpeta...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Info...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Uso de Almacenamiento</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Obteniendo información de uso</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Nota:</b> Algunas carpetas, incluyendo unidades de red o carpetas compartidas, pueden tener límites diferentes.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Confirmar la eliminación de la carpeta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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>Note:</b> Esto no eliminará los archivos de su cliente.</p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Confirme que desea restablecer la carpeta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>No hay ninguna conexión de %1 configurada.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Conectado a <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Iniciar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Actualmente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Completamente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 de %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Finalizado</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync: Falló debido a un permiso denegado.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync: Falló en encontrar un archivo especifico.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync trató de crear un directorio que ya existe.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>Ha ocurrido un error de transmisión HTTP.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Interrumpido por el usuario</translation> @@ -1257,13 +1260,13 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1276,153 +1279,62 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg <translation>Formulario</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>Etiqueta de texto</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Hora</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Archivo</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Carpeta</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Acción</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Tamaño</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Enlace simbólico ignorado</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>Los enlaces simbólicos rompen el semanticismo de la sincronización. -Por favor, no los utilice en directorios sincronizados</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>archivo</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>carpeta</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>%1 fue ignorado por que está en la lista de clientes ignorados -o el nombre de %1 contiene caracteres no sincronizables -en un entorno multiplataforma</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Elemento ignorado</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 en la lista de ignorados</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>%1 fue omitido por que está en la lista de clientes -con nombre para ignorar.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Caracteres inválidos</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>El nombre %1 contiene uno o más caracteres inválidos que romperán -la sincronización en un entorno multiplataforma</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Archivo duplicado.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>El archivo ha cambiado en el servidor y en el repositorio local y como resultado -se ha creado un archivo llamado conflicto. El cambio local se ha copiado al -archivo conflicto y el archivo del servidor está disponible con el nombre -original</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Copiado al portapapeles</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>No hay más espacio disponible en el servidor.</translation> </message> @@ -1602,127 +1514,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>Sincronización %1 iniciada</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Iniciada la sincronización de %n carpeta configurada para sincronizar.</numerusform><numerusform>Iniciada la sincronización para %n carpeta(s) configuradas para sincronizar.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Archivo %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>No hay carpetas de sincronización configuradas.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Ninguno.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Cambios recientes</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Abrir carpeta %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Carpetas administradas:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Abrir carpeta '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Abrir %1 en el navegador</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Calculando cuota...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Estado desconocido</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Detalles...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Salir de %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Cuota no disponible</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1% de %2 en uso</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>No se han sincronizado elementos recientemente</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Sincronizando %1 de %2 (%3 de %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Actualizado</translation> </message> @@ -1995,7 +1897,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -2003,7 +1905,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>No se pudo eliminar el directorio %1</translation> </message> @@ -2210,8 +2112,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Error de sincronización - Pulse el botón de información para obtener más detalles.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index 09520d5e3..1edb2a617 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Pausar</translation> </message> @@ -104,127 +104,130 @@ <translation>Agregar directorio...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Información...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Uso del Almacenamiento</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Obteniendo información del uso...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Nota:</b> Algunas carpetas, incluidas las montadas en red o las carpetas compartidas, pueden tener diferentes límites.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Confirmá la eliminación del directorio</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Confirme el reseteo de la carpeta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>No hay ninguna conexión de %1 configurada.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Conectado a <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Inicio</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Actualmente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Completamente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 de %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Completamente terminado.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync: Falló debido a un permiso denegado.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync: Falló en encontrar un archivo especifico.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>Csync trató de crear un directorio que ya existía.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>Ha ocurrido un error de transmisión HTTP.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Interrumpido por el usuario</translation> @@ -1255,13 +1258,13 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1274,145 +1277,62 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú <translation>Formulario</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Hora</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Archivo</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Carpeta</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Acción</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Tamaño</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>archivo</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>directorio</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Elemento ignorado</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Caracteres no válidos</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Archivo duplicado.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Copiado al portapapeles</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>No hay más espacio disponible en el servidor.</translation> </message> @@ -1592,127 +1512,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>Sincronización de %1 iniciada</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>one: Iniciada la sincronización para %n directorio(s) configurados para sincronizar.</numerusform><numerusform>other: Iniciada la sincronización de %n directorio(s) configurado para sincronizar.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Directorio %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Los directorios de sincronización no están configurados.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Ninguno.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Cambios recientes</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Abrir directorio %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Directorios administrados:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Abrir carpeta '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Abrir %1 en el navegador...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Calculando cuota...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Estado desconocido</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Detalles...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Cancelar %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Cuota no disponible</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1% de %2 en uso</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>No se sincronizaron elementos recientemente</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Sincronizando %1 de %2 (%3 de %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>actualizado</translation> </message> @@ -1986,7 +1896,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1994,7 +1904,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation type="unfinished"/> </message> @@ -2201,8 +2111,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Error de sincronización - Pulsá el botón de información para obtener más detalles.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index 45da4bcf7..91ab32675 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Paus</translation> </message> @@ -104,127 +104,130 @@ <translation>Lisa kataloog...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Info...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Mahu kasutus</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Otsin kasutuse informatsiooni...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Märkus:</b> Mõned kataloogid, sealhulgas võrgust ühendatud või jagatud kataloogid, võivad omada erinevaid limiite.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Taasta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Kinnita kausta eemaldamist</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Kinnita kataloogi algseadistus</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Ühtegi %1 ühendust pole seadistatud.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Sünkroniseerimine on käimas</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation>Ühtegi kontot pole seadistatud</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation>Kasutusel %1 / %2 (%3%)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Ühendatud <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Start</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Hetkel</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Täielikult</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 / %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Täielikult lõpetatud.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 / %2, fail %3 / %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <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/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation>Ühendus puudub %1 at <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation>Hetkel pole mahu kasutuse info saadaval.</translation> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync ebaõnnestus ligipääsu puudumisel.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync ei suutnud leida konkreetset faili.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>Csync proovis tekitada kataloogi, mis oli juba olemas.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation> </message> @@ -378,6 +376,11 @@ <translation>HTTP ülekande viga.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Kasutaja poolt tühistatud</translation> @@ -1257,13 +1260,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1276,152 +1279,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Vorm</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation>Täpsem sünkroniseeringu staatus</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>Tekstisilt</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Aeg</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Fail</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Kaust</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Tegevus</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Suurus</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Kopeeri</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Soft linki ingoreeriti</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>Softlingid lõhuvad sünkroniseeringu. -Palun ära kasuta neid sünkroniseeritavates kataloogides</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>fail</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>kaust</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>Faili %1 ignoreeriti kuna see on märigitud kliendi ignoreeritavate nimekirjas⏎ -või sisaldab %1 faili nimi sümboleid, mida ei saa sünkroniseerida erinevate⏎ -keskkonna platvormide vahel.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Üksust ignoreeriti</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 on ignoreeritavate nimistus</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>%1 jäeti vahele, kuna see on märgitud kliendi⏎ -ignoreeritavate nimistus</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Sobimatud sümbolid</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>%1 nimi sisaldab ühte või rohkemat sobimatut sümbolit, mis rikub⏎ -sünkroniseeringu erinevate keskkonna platvormide vahel.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Konfliktne fail.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>Faili on muudetud serveris ning kohalikus repostitiooriumis ning selle -tulemusel on tekitatud nn konflikt. Kohalik muudatus on kopeeritud -konflikt-failiks ning serveris asuv fail on saadaval algse nimega.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Kopeeritud lõikepuhvrisse</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <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/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>Serveris pole rohkem vaba ruumi.</translation> </message> @@ -1602,127 +1515,117 @@ Palun veendu, et võrguühendus toimib.</translation> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 sünkroniseerimine käivitati</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Sünkroniseerimine alustati %n seadistatud sünkroniseeritavas kaustas.</numerusform><numerusform>Sünkroniseerimine alustati %n seadistatud sünkroniseeritavastes kaustades.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Kaust %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Sünkroniseeritavaid kaustasid pole seadistatud.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Pole.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Hiljutised muudatused</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Ava kaust %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Hallatavad kaustad:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Ava kaust '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Ava %1 veebilehitsejas</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Mahupiiri arvutamine...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Tundmatu staatus</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Seaded...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Üksikasjad...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Abiinfo</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Lõpeta %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Mahupiir n/a</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>Kasutusel %1% / %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Ühtegi üksust pole hiljuti sünkroniseeritud</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Sünkroniseerin %1 / %2 (%3 / %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Ajakohane</translation> </message> @@ -1995,7 +1898,7 @@ Palun veendu, et võrguühendus toimib.</translation> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation>ei suuda luua kataloogi %1</translation> </message> @@ -2003,7 +1906,7 @@ Palun veendu, et võrguühendus toimib.</translation> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>Kausta %1 ei saa eemaldada</translation> </message> @@ -2210,8 +2113,8 @@ Palun veendu, et võrguühendus toimib.</translation> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Sünkroniseerimise viga - Üksikasjade nägemiseks kliki info nupule.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index 984b0dbc7..1ba8188a0 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Pausarazi</translation> </message> @@ -104,127 +104,130 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Info...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Berrekin</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Baieztatu karpetaren ezabatzea</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Ez dago %1 konexiorik konfiguratuta.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Sinkronizazioa martxan da</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSyncek huts egin du kudeatu gabeko baimen ukapen bat dela eta.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSyncek huts egin du fitxategi zehatz bat aurkitzen.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSyncek dagoeneko existitzen zen karpeta bat sortzen saiatu da.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>HTTP transmisio errore bat gertatu da.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation type="unfinished"/> @@ -1250,13 +1253,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1269,145 +1272,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>TestuEtiketa</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Noiz</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Karpeta</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Tamaina</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Kopiatu</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>fitxategia</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>direktorioa</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Arbelera kopiatua</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation type="unfinished"/> </message> @@ -1587,127 +1507,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 Sinkronizazioa hasi da</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Ez dago sinkronizazio karpetarik definituta.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Ireki %1 karpeta</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Kudeatutako karpetak:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Laguntza</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Eguneratua</translation> </message> @@ -1980,7 +1890,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1988,7 +1898,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation type="unfinished"/> </message> @@ -2195,8 +2105,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Sinkronizazio Errorea -Klikatu info botoia xehetasun gehiagorako.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index f6e0741a0..df4221626 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>توقف کردن</translation> </message> @@ -104,127 +104,130 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>قبول کردن پاک شدن پوشه</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>همگام سازی در حال اجراست</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>عدم موفقیت CSync در پیدا کردن یک فایل خاص.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync برای ایجاد یک پوشه که در حال حاضر موجود است تلاش کرده است.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>خطا در انتقال HTTP اتفاق افتاده است.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation type="unfinished"/> @@ -1250,13 +1253,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1269,145 +1272,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>فرم</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>برچسب متنی</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>زمان</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>پوشه</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>اندازه</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>کپی کردن</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>پرونده</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>پوشه</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>کپی به کلیپ بورد</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation type="unfinished"/> </message> @@ -1587,127 +1507,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 همگام سازی شروع شد.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation type="unfinished"><numerusform></numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>پوشه %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>هیچ پوشه ای همگام سازی شدهای تنظیم نشده است</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>بازکردن %1 پوشه</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>پوشه های مدیریت شده:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>راهنما</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>تا تاریخ</translation> </message> @@ -1980,7 +1890,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1988,7 +1898,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation type="unfinished"/> </message> @@ -2195,7 +2105,7 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> + <source>Sync Error</source> <translation type="unfinished"/> </message> <message> diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index 5d7175be3..3fd58626c 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Keskeytä</translation> </message> @@ -104,127 +104,130 @@ <translation>Lisää kansio...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Tiedot...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Tilan käyttö</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Noudetaan käyttötietoja...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Jatka</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Vahvista kansion poisto</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>%1-yhteyttä ei ole määritelty.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Synkronointi meneillään</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Muodosta yhteys - <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4/%5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Kokonaan valmis.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1/%2, tiedosto %3/%4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync ei löytänyt tiettyä tiedostoa.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync yritti luoda olemassa olevan kansion.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>Tapahtui HTTP-välitysvirhe.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation type="unfinished"/> @@ -1250,13 +1253,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1269,145 +1272,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Lomake</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>TekstiLeima</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Aika</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Tiedosto</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Kansio</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Toiminto</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Koko</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>tiedosto</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>kansio</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Virheellisiä merkkejä</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Kopioitu leikepöydälle</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>Palvelimella ei ole enää tallennustilaa käytettävissä.</translation> </message> @@ -1587,127 +1507,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Kansio %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Synkronointikansioita ei ole määritetty.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Viimeisimmät muutokset</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Avaa %1-kansio</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Hallitut kansiot:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Avaa kansio '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Avaa %1 selaimeen</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Tuntematon tila</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Asetukset...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Tiedot...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Ohje</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Lopeta %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1%/%2 käytössä</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Kohteita ei ole synkronoitu äskettäin</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Synkronoidaan %1/%2 (%3/%4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Ajan tasalla</translation> </message> @@ -1980,7 +1890,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1988,7 +1898,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation type="unfinished"/> </message> @@ -2195,8 +2105,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Synkronointivirhe – Napsauta Tietoja.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index 3b82ce09b..077e6ae4e 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Mettre en pause</translation> </message> @@ -104,127 +104,130 @@ <translation>Ajouter un dossier...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Information...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Utilisation du stockage</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Récupération des informations d'utilisation...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Note :</b> Certains fichiers, incluant des dossiers montés depuis le réseau ou des dossiers partagés, peuvent avoir des limites différentes.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Reprendre</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Confirmer le retrait du dossier</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Confirmation de la réinitialisation du dossier</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Aucune connexion à %1 configurée</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Synchronisation en cours</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation>Aucun compte configuré.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La synchronisation est en cours.<br/>Voulez-vous y mettre un terme?</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation>%1 of %2 (%3%) occupés.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Connecté à <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Démarrer</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Actuellement</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Complètement</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 de %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Complètement terminé.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 de %2, fichier %3 de %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <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/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation>Aucune connexion à %1 pour <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync a échoué en raison d'une erreur de permission non prise en charge.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync n'a pu trouver le fichier spécifié.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <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> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation>Impossible d'initialiser un journal de synchronisation.</translation> </message> @@ -378,6 +376,11 @@ <translation>Une erreur de transmission HTTP s'est produite.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Abandonné par l'utilisateur</translation> @@ -1257,13 +1260,13 @@ Les items cochés seront également supprimés s'ils empêchent la suppress <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation>Fichier local modifié pendant la synchronisation, la synchronisation redémarrera lorsque ce sera terminé</translation> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1276,152 +1279,62 @@ Les items cochés seront également supprimés s'ils empêchent la suppress <translation>Formulaire</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation>Statut de synchronisation détaillé</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>Zone de texte</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Heure</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Fichier</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Dossier</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Action</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Taille</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Copier</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Lien symbolique ignoré</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>Les liens symboliques cassent la sémantique de la synchronisation. -Veuillez ne pas les utiliser dans les dossiers synchronisés.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>fichier</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>dossier</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>Le %1 a été ignoré car il est présent dans la liste des clients à ignorer -ou le nom de %1 contient des caractères qui ne sont pas synchronisables -dans un environnement multi-plateforme</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Item ignoré</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 dans la liste à ignorer</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>Le %1 a été ignoré car il est présent dans la liste des -noms de clients à ignorer</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Caractères invalides</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>Le nom de %1 contient un ou plusieurs caractères invalides qui ne -sont pas synchronisables dans un environnement multi-plateforme</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Fichier de conflits</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>Le fichier a été modifié sur le serveur mais également sur le dépôt local -ce qui crée un conflit. La modification locale est copiée dans le fichier de -conflits et le fichier côté serveur est disponible sous son nom original.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Copié dans le presse-papiers</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation>Le statu de synchronisation a été copié dans le presse-papier.</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>Plus aucun espace de stockage n'est disponible sur le serveur.</translation> </message> @@ -1601,127 +1514,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 Synchronisation démarrée </translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Synchronisation démarrée pour le dossier configuré.</numerusform><numerusform>Synchronisation démarrée pour les %n dossier(s) configuré(s).</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Dossier %1 : %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Aucun répertoire synchronisé n'est configuré.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Aucun.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Modifications récentes</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Ouvrir le répertoire %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Répertoires suivis :</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Ouvrir le dossier '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Ouvrir %1 dans le navigateur</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Calcul du quota...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Statut inconnu</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Paramètres...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Détails...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Aide</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Quitter %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Quota n/a</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1% de %2 occupés</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Aucun item synchronisé récemment</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Synchronisation %1 de %2 (%3 de %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>À jour</translation> </message> @@ -1994,7 +1897,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation>impossible de créer le répertoire %1</translation> </message> @@ -2002,7 +1905,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>Impossible de supprimer le dossier %1</translation> </message> @@ -2209,8 +2112,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Erreur de synchronisation - Cliquez sur le bouton info pour plus de détails.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index 14134d20b..39f096163 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -80,7 +80,7 @@ <message> <location filename="../src/mirall/accountsettings.ui" line="46"/> <source>Account to Synchronize</source> - <translation type="unfinished"/> + <translation>Conta para sincronizar</translation> </message> <message> <location filename="../src/mirall/accountsettings.ui" line="52"/> @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Pausa</translation> </message> @@ -104,127 +104,130 @@ <translation>Engadir un cartafol...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Información...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Uso do almacenamento</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Recuperando información de uso...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Nota:</b> Algúns cartafoles, como os cartafoles de rede montados ou os compartidos, poden ten diferentes límites.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Confirmar a eliminación do cartafol</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Confirmar o restabelecemento do cartafol</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Non se configurou a conexión %1.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Sincronización en proceso</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation>Non hai contas configuradas.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Estase realizando a sincronización.<br/>Quere interrompela e rematala?</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation>Usado %1 de %2 (%3%).</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Conectado a <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Iniciar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Actual</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Completado</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 de %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Totalmente terminada.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 de %2, ficheiro %3 de %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <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/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation>Sen conexión con %1 en <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <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> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>Produciuse un fallo en CSync por mor dun permiso denegado.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync non puido atopar o ficheiro especificado.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSYNC tenta crear un directorio que xa existe.</translation> @@ -355,10 +353,10 @@ <message> <location filename="../src/mirall/csyncthread.cpp" line="228"/> <source>The item is not synced because it is on the blacklist.</source> - <translation type="unfinished"/> + <translation>O elemento non está sincronizado, xa que está na lista negra.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation>Non é posíbel iniciar un rexistro de sincronización.</translation> </message> @@ -378,6 +376,11 @@ <translation>Produciuse un erro na transmisión HTTP.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Interrompido polo usuario</translation> @@ -629,7 +632,7 @@ fiábel. Revise a documentación para posíbeis arranxos.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="92"/> <source>No valid local folder selected!</source> - <translation type="unfinished"/> + <translation>Non seleccionou ningún cartafol local correcto!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="97"/> @@ -639,27 +642,27 @@ fiábel. Revise a documentación para posíbeis arranxos.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="121"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> - <translation type="unfinished"/> + <translation>A ruta local %1 xa é un cartafol de envío. Escolla outro!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="133"/> <source>The selected folder is a symbolic link. An already configuredfolder is contained in the folder this link is pointing to.</source> - <translation type="unfinished"/> + <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/mirall/folderwizard.cpp" line="140"/> <source>An already configured folder contains the currently entered folder.</source> - <translation type="unfinished"/> + <translation>Xa hai un cartafol configurado que contén o cartafol que foi indicado.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="146"/> <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>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/mirall/folderwizard.cpp" line="170"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> - <translation type="unfinished"/> + <translation>O alcume <i>%1</> xa está a seren usado. Escolla outro alcume.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="126"/> @@ -697,17 +700,17 @@ fiábel. Revise a documentación para posíbeis arranxos.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="264"/> <source>Failed to create the folder on %1. Please check manually.</source> - <translation type="unfinished"/> + <translation>Non foi posíbel crear o cartafol en %1. Compróbeo manualmente.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="368"/> <source>This folder is already being synced.</source> - <translation type="unfinished"/> + <translation>Este cartafol xa está sincronizado.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="374"/> <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>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> <message> <location filename="../src/mirall/folderwizard.cpp" line="313"/> @@ -726,7 +729,7 @@ fiábel. Revise a documentación para posíbeis arranxos.</translation> <location filename="../src/mirall/folderwizard.cpp" line="43"/> <location filename="../src/mirall/folderwizard.cpp" line="45"/> <source><b>Warning:</b> </source> - <translation type="unfinished"/> + <translation><b>Aviso:</b> </translation> </message> </context> <context> @@ -768,12 +771,12 @@ fiábel. Revise a documentación para posíbeis arranxos.</translation> <message> <location filename="../src/creds/httpcredentials.cpp" line="241"/> <source>Enter Password</source> - <translation type="unfinished"/> + <translation>Escriba o contrasinal</translation> </message> <message> <location filename="../src/creds/httpcredentials.cpp" line="242"/> <source>Please enter %1 password for user '%2':</source> - <translation type="unfinished"/> + <translation>Escriba o contrasinal %1 para o usuario «%2»:</translation> </message> </context> <context> @@ -1257,15 +1260,15 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation>O ficheiro local cambiou durante a sincronización, sincronizando unha vez quedou completado</translation> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> - <translation type="unfinished"/> + <translation>A sincronización foi interrompida polo usuario.</translation> </message> </context> <context> @@ -1276,153 +1279,62 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is <translation>Formulario</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation>Estado detallado da sincronización</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>Etiqueta de texto</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Hora</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Ficheiro</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Cartafol</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Acción</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Tamaño</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Ligazón branda ignorada</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>As ligazóns brandas rachan a semántica de sincronización. -Non as use en directorios sincronizados.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>ficheiro</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>directorio</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>O ficheiro foi ignorado porque aparece na lista de ignorados nos -clientes ou porque o nome %1 contén caracteres que non son -sincronizábeis nun entorno multiplataforma.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Elemento ignorado</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 está na lista de ignorados</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>O %1 foi omitido xa que está na lista de nomes que -ignorar nos clientes</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Caracteres incorrectos</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>O nome %1 conten un ou máis caracteres incorrectos porque rachan -a sincronización ene entornos multiplataforma</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Ficheiro de conflitos.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>O ficheiro foi cambiado no servidor e no repositorio local e como resultado -crease o que se chama un conflito. O cambio local copiase no ficheiro de -conflitos, mentres que o ficheiro do lado do servidor está dispoñíbel baixo -o nome orixinal</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Copiado no portapapeis.</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <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/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>Non hai máis espazo de almacenamento dispoñíbel no servidor.</translation> </message> @@ -1569,7 +1481,7 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation> <message> <location filename="../src/mirall/systray.cpp" line="49"/> <source>%1: %2</source> - <translation type="unfinished"/> + <translation>%1: %2</translation> </message> </context> <context> @@ -1603,127 +1515,117 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>Comezou a sincronización %1</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Comezou a sincronización para %n cartafol coa sincronización configurada.</numerusform><numerusform>Comezou a sincronización para %n cartafoles con sincronización configurada.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> - <translation type="unfinished"/> + <translation>Ten que rexistrarse</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Cartafol %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Non se configuraron cartafoles de sincronización.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Nada.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Cambios recentes</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Abrir o cartafol %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Cartafoles xestionados:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Abrir o cartafol «%1»</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Abrir %1 nun navegador</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Calculando a cota...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Estado descoñecido</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Axustes...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Detalles...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Axuda</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Saír de %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> - <translation type="unfinished"/> + <translation>Rexistrarse...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> - <translation type="unfinished"/> + <translation>Saír</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Cota n/d</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>Usado %1% de %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Non hai elementos sincronizados recentemente</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Sincronizando %1 de %2 (%3 de %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Actualizado</translation> </message> @@ -1996,7 +1898,7 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation>non foi posíbel crear o directorio %1</translation> </message> @@ -2004,7 +1906,7 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>Non foi posíbel retirar o directorio %1</translation> </message> @@ -2211,8 +2113,8 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Erro de sincronización - Fai clic no botón de información para ver os detalles.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts index 5c61ddf0a..13642625f 100644 --- a/translations/mirall_hu.ts +++ b/translations/mirall_hu.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Szünet</translation> </message> @@ -104,127 +104,130 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Információ</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Tárhelyhasználat</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Folytatás</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Könyvtár törlésének megerősítése</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Szinkronizálás fut</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Teljesen befejezve.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync hiba, nincs kezelési jogosultság.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>A CSync nem találja a megadott fájlt.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <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> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>HTTP átviteli hiba történt.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation type="unfinished"/> @@ -1250,13 +1253,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1269,145 +1272,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Űrlap</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Idő</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Fájl</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Mappa</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Művelet</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Méret</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Másolás</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>fájl</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>mappa</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Bemásolva a vágólapra</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation type="unfinished"/> </message> @@ -1587,127 +1507,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 szinkronizálás elindult</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Mappa %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Nincsenek megadva szinkronizálandó mappák.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Legutóbbi változások</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>%1 mappa megnyitása</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Kezelt mappák:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Kvóta kiszámítása...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Ismeretlen állapot</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Beállítások...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Részletek...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Súgó</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Kvóta n/a</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Frissítve</translation> </message> @@ -1980,7 +1890,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1988,7 +1898,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation type="unfinished"/> </message> @@ -2195,7 +2105,7 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> + <source>Sync Error</source> <translation type="unfinished"/> </message> <message> diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index 876abec9a..3a8155998 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -80,7 +80,7 @@ <message> <location filename="../src/mirall/accountsettings.ui" line="46"/> <source>Account to Synchronize</source> - <translation type="unfinished"/> + <translation>Account da sincronizzare</translation> </message> <message> <location filename="../src/mirall/accountsettings.ui" line="52"/> @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Pausa</translation> </message> @@ -104,127 +104,130 @@ <translation>Aggiungi cartella...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Informazioni...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Utilizzo archiviazione</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Recupero delle informazioni di utilizzo in corso...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Nota:</b> alcune cartelle, incluse le cartelle montate o condivise in rete, potrebbero avere limiti diversi.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Riprendi</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Conferma la rimozione della cartella</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Conferma il ripristino della cartella</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Nessuna connessione di %1 configurata.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>La sincronizzazione è in corso</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation>Nessun account configurato.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation>%1 di %2 (%3%) utilizzati.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Connesso a <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Avvia</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Attualmente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Completamente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 di %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Terminata completamente.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 di %2, file %3 di %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <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/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation>Nessuna connessione a <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>Problema di CSync dovuto alla mancata gestione dei permessi.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync non è riuscito a trovare un file specifico.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync ha cercato di creare una cartella già esistente.</translation> @@ -355,12 +353,12 @@ <message> <location filename="../src/mirall/csyncthread.cpp" line="228"/> <source>The item is not synced because it is on the blacklist.</source> - <translation type="unfinished"/> + <translation>Questo oggetto non è stato sincronizzato perché è sulla lista nera.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> - <translation type="unfinished"/> + <translation>Impossibile inizializzare registro di sincronizzazione.</translation> </message> <message> <location filename="../src/mirall/csyncthread.cpp" line="149"/> @@ -378,6 +376,11 @@ <translation>Si è verificato un errore di trasmissione HTTP.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Interrotto dall'utente</translation> @@ -629,7 +632,7 @@ documentazione per trovare possibili soluzioni.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="92"/> <source>No valid local folder selected!</source> - <translation type="unfinished"/> + <translation>Nessuna cartella locale valida selezionata!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="97"/> @@ -639,7 +642,7 @@ documentazione per trovare possibili soluzioni.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="121"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> - <translation type="unfinished"/> + <translation>Il percorso locale %1 è già una cartella di caricamento. Selezionane un altro!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="133"/> @@ -649,7 +652,7 @@ documentazione per trovare possibili soluzioni.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="140"/> <source>An already configured folder contains the currently entered folder.</source> - <translation type="unfinished"/> + <translation>Una cartella già configurata contiene la cartella appena inserita.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="146"/> @@ -659,7 +662,7 @@ documentazione per trovare possibili soluzioni.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="170"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> - <translation type="unfinished"/> + <translation>L'alias <i>%1</i> è già in uso. Indica un altro alias.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="126"/> @@ -697,12 +700,12 @@ documentazione per trovare possibili soluzioni.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="264"/> <source>Failed to create the folder on %1. Please check manually.</source> - <translation type="unfinished"/> + <translation>Non è stato possibile creare la directory su %1. Controlla manualmente.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="368"/> <source>This folder is already being synced.</source> - <translation type="unfinished"/> + <translation>Questa cartella è già sincronizzata.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="374"/> @@ -726,7 +729,7 @@ documentazione per trovare possibili soluzioni.</translation> <location filename="../src/mirall/folderwizard.cpp" line="43"/> <location filename="../src/mirall/folderwizard.cpp" line="45"/> <source><b>Warning:</b> </source> - <translation type="unfinished"/> + <translation><b>Attenzione:</b></translation> </message> </context> <context> @@ -768,7 +771,7 @@ documentazione per trovare possibili soluzioni.</translation> <message> <location filename="../src/creds/httpcredentials.cpp" line="241"/> <source>Enter Password</source> - <translation type="unfinished"/> + <translation>Digita la password</translation> </message> <message> <location filename="../src/creds/httpcredentials.cpp" line="242"/> @@ -1257,15 +1260,15 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> - <translation type="unfinished"/> + <translation>Un file locale è cambiato durante la sincronizzazione, riprovare più avanti.</translation> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> - <translation type="unfinished"/> + <translation>Sincronizzazione interrotta dall'utente.</translation> </message> </context> <context> @@ -1276,152 +1279,62 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un <translation>Modulo</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> - <translation type="unfinished"/> + <translation>Stato di sincronizzazione dettagliato</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>EtichettaTesto</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Ora</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>File</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Cartella</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Azione</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Dimensione</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Copia</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Collegamento ignorato</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>I collegamenti rovinano la semantica di sincronizzazione. -Non utilizzarli nelle cartelle sincronizzate</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>file</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>cartella</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>%1 è stato ignorato perché è presente nell'elenco dei nomi da ignorare dei client -oppure il nome di %1 contiene caratteri non sono sincronizzabili -in un ambiente multipiattaforma</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Elemento ignorato</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 nell'elenco ignorati</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>%1 è stato omesso perché è presente nell'elenco dei client dei nomi -da ignorare</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Caratteri non validi</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>Il nome %1 contiene uno o più caratteri non validi che rovinano -la sincronizzazione in un ambiente multipiattaforma</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>File in conflitto.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>Il file è stato modificato sul server e sul deposito locale e ciò genera -un cosiddetto conflitto. La modifica locale viene copiata sul file in -conflitto, mentre il file sul server è disponibile con il nome originale</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Copiato negli appunti</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <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/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>Spazio di archiviazione insufficiente sul server.</translation> </message> @@ -1474,13 +1387,14 @@ conflitto, mentre il file sul server è disponibile con il nome originale</trans <message> <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/> <source>Error loading IdP login page</source> - <translation type="unfinished"/> + <translation>Errore durante il caricamento della pagina di login IdP</translation> </message> <message> <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/> <source>Could not load Shibboleth login page to log you in. Please ensure that your network connection is working.</source> - <translation type="unfinished"/> + <translation>Impossibile caricare la pagina di login Shibboleth per autenticarti. +Assicurati che la tua connessione sia funzionante.</translation> </message> </context> <context> @@ -1567,7 +1481,7 @@ Please ensure that your network connection is working.</source> <message> <location filename="../src/mirall/systray.cpp" line="49"/> <source>%1: %2</source> - <translation type="unfinished"/> + <translation>%1: %2</translation> </message> </context> <context> @@ -1601,127 +1515,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 Sincronizzazione iniziata</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Sincronizzazione avviata per %n cartella configurata.</numerusform><numerusform>Sincronizzazione avviata per %n cartelle configurate.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> - <translation type="unfinished"/> + <translation>Per favore accedi</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Cartella %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Nessuna cartella configurata per la sincronizzazione.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Nessuna.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Modifiche recenti</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Apri la cartella %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Cartelle gestite:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Apri la cartella '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Apri %1 nel browser...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Calcolo quota in corso...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Stato sconosciuto</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Impostazioni...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Dettagli...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Aiuto</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Esci da %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> - <translation type="unfinished"/> + <translation>Accedi...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> - <translation type="unfinished"/> + <translation>Esci</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Quota n/d</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1% di %2 utilizzati</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Nessun elemento sincronizzato di recente</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Sincronizzazione di %1 di %2 (%3 di %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Aggiornato</translation> </message> @@ -1994,7 +1898,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation>impossibile creare la cartella %1</translation> </message> @@ -2002,7 +1906,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>Impossibile rimuovere la cartella %1</translation> </message> @@ -2209,8 +2113,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Errore di sincronizzazione - Clic sul pulsante informazioni per i dettagli.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index a84b4af8e..f3297b740 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>一時停止</translation> </message> @@ -104,127 +104,130 @@ <translation>フォルダを追加…</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>情報...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>ストレージ利用状況</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>利用状況を取得中...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>注:</b> 外部ネットワークストレージ、共有フォルダを含んだフォルダーの場合は、上限値は違うかもしれません。</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>再開</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>フォルダの削除を確認</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>フォルダのリセットを確認</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>%1 の接続は設定されていません。</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>同期実行中</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>同期操作が実行中です。<br/>終了してもよろしいですか？</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation><a href="%1">%2</a> へ接続しました。</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>開始</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>現在</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>完全に</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 of %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>完全に終了しました。</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 of %2, ファイル数 %3 of %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation>現在、利用できるストレージ使用情報はありません。</translation> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSyncは対応できないパーミッション拒否が原因で失敗しました。</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSyncは特定のファイルを見つけることができませんでした。</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSyncはすでに存在するディレクトリを作成しようとしました。</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>HTTPの伝送エラーが発生しました。</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>ユーザによって中止されました</translation> @@ -1257,13 +1260,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1276,147 +1279,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>フォーム</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>テキストラベル</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>時刻</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>ファイル</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>フォルダ</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>アクション</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>サイズ</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>コピー</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>ソフトリンクは無視されました</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>ソフトリンクは同期の意味を破壊します。 -同期するディレクトリではそれらを使用しないでください。</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>ファイル</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>ディレクトリ</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>クライアントの無視リストに記載されているか、%1の名前にクロスプラットフォーム環境で同期できない文字が含まれているために、%1は無視されました。</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>アイテムは無視されました</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>無視リスト上の%1</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>無視するクライアントの名前リストに記載されているために、%1はスキップされました。</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>無効な文字</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>%1の名前に、クロスプラットフォーム環境での同期を破壊する -無効な文字が1つ以上含まれています。</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>競合ファイル</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>サーバー側とローカル側のファイルが変更された為、競合ファイルが作成されました。ローカル側の変更は、競合Conflictファイルへコピーされ、サーバー側のファイルは、元々のファイル名で利用できます。</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>クリップボードにコピー</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>サーバー上で利用可能なストレージ容量が足りません。</translation> </message> @@ -1596,127 +1514,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 同期開始</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>%n 個の設定済み同期フォルダの同期を開始しました。</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>フォルダ %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>同期フォルダが設定されていません。</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>なし</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>最近変更されたファイル</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>%1 フォルダを開く</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>管理フォルダ:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>フォルダ ’%1’ を開く</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>%1 をブラウザーで開く</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>制限容量を計算中...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>不明な状態</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>設定</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>詳細...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>ヘルプ</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>%1 を終了</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>クオータ n/a</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%2 のうち %1% を使用中</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>最近同期されたアイテムはありません。</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>%2 の %1 (%4 分の %3) を同期中</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>最近です</translation> </message> @@ -1989,7 +1897,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1997,7 +1905,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>ディレクトリ %1 を削除できません</translation> </message> @@ -2204,8 +2112,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>同期エラー: ボタンを押して詳細を確認してください。</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index 4ed5ec9dc..0f8ccfc70 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -80,7 +80,7 @@ <message> <location filename="../src/mirall/accountsettings.ui" line="46"/> <source>Account to Synchronize</source> - <translation type="unfinished"/> + <translation>Account om te synchroniseren</translation> </message> <message> <location filename="../src/mirall/accountsettings.ui" line="52"/> @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Pause</translation> </message> @@ -104,127 +104,130 @@ <translation>Map toevoegen...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Info...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Gebruik opslagruimte</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Gebruiksinformatie wordt opgehaald ...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Opmerking:</b> Sommige folders, waaronder netwerkfolders en gedeelde folders, kunnen andere limieten hebben.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Hervatten</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Bevestig het verwijderen van de map</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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 de folder <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Bevestig map reset</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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 de 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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Geen %1 connectie geconfigureerd.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Bezig met synchroniseren</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> - <translation type="unfinished"/> + <translation>%1 van %2 (%3%) in gebruik.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Verbonden met <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Start</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Momenteel</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Volledig</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 van %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Helemaal klaar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 van %2, bestand %3 van %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> - <translation type="unfinished"/> + <translation>Verbonden met <a href="%1">%2</a> als <i>%3</i>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> - <translation type="unfinished"/> + <translation>Geen verbinding met %1 op <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <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> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync mislukt omdat de benodigde toegang werd geweigerd.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync kon een bepaald bestand niet vinden.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync probeerde een al bestaande directory aan te maken.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>Er trad een HTTP transmissiefout plaats.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Afgebroken door de gebruiker</translation> @@ -393,7 +396,7 @@ <message> <location filename="../src/mirall/connectionvalidator.cpp" line="90"/> <source>No ownCloud account configured</source> - <translation type="unfinished"/> + <translation>Geen ownCloud-account geconfigureerd</translation> </message> <message> <location filename="../src/mirall/connectionvalidator.cpp" line="105"/> @@ -452,37 +455,37 @@ <message> <location filename="../src/mirall/folder.cpp" line="386"/> <source>downloaded</source> - <translation type="unfinished"/> + <translation>gedownload</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="387"/> <source>removed</source> - <translation type="unfinished"/> + <translation>verwijderd</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="388"/> <source>updated</source> - <translation type="unfinished"/> + <translation>geüpdatet</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="389"/> <source>renamed</source> - <translation type="unfinished"/> + <translation>hernoemd</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="401"/> <source>'%1' has been %2.</source> - <translation type="unfinished"/> + <translation>'%1' was %2.</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="403"/> <source>Files %1</source> - <translation type="unfinished"/> + <translation>Bestanden %1</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="404"/> <source>'%1' and %2 other files have been %3.</source> - <translation type="unfinished"/> + <translation>'%1' en %2 andere bestanden waren %3.</translation> </message> <message> <location filename="../src/mirall/folder.cpp" line="446"/> @@ -629,7 +632,7 @@ werken. Controleer de de documentatie voor mogelijke oplossingen.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="92"/> <source>No valid local folder selected!</source> - <translation type="unfinished"/> + <translation>Geen geldige lokale map geselecteerd!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="97"/> @@ -702,7 +705,7 @@ werken. Controleer de de documentatie voor mogelijke oplossingen.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="368"/> <source>This folder is already being synced.</source> - <translation type="unfinished"/> + <translation>Deze map is al gesynchroniseerd.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="374"/> @@ -739,7 +742,7 @@ werken. Controleer de de documentatie voor mogelijke oplossingen.</translation> <message> <location filename="../src/mirall/generalsettings.ui" line="20"/> <source>General Setttings</source> - <translation type="unfinished"/> + <translation>Algemene Instellingen</translation> </message> <message> <location filename="../src/mirall/generalsettings.ui" line="26"/> @@ -1257,15 +1260,15 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> - <translation type="unfinished"/> + <translation>Synchronisatie afgebroken door gebruiker.</translation> </message> </context> <context> @@ -1276,154 +1279,62 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee <translation>Formulier</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>Tekstlabel</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Tijd</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Bestand</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Map</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Handeling</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Grootte</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Kopiëren</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Soft link overgeslagen</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>Softlinks verbreken de semantiek van synchronisatie. -Gebruik deze niet in gesynchroniseerde mappen.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>bestand</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>directory</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>De %1 is genegeerd omdat deze is opgenomen op de lijst van -te negeren bestanden of doordat de naam %1 karakters bevat -die niet gesynchroniseerd kunnen worden van het ene naar -het andere platform</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Bestand overgeslagen</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 op de lijst met genegeerde bestanden</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>De %1 is overgeslagen omdat de lijst met te negeren -namen staat</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Ongeldige karakters</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>De naam %1 bevat één of meer ongeldige karakters waardoor -de synchronsatie van het ene naar het andere platform mislukt.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Conflicterend bestand.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>Het bestand is gewijzigd zowel op de server en als in de lokale opslag⏎ -met als resultaat een zogenaamd conflict. De lokale wijziging is⏎ -gekopieerd naar het conflicterende bestand, terwijl het bestand dat⏎ -op de server staat beschikbaar blijft met de originele naam.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Gekopieerd naar het klembord</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>Geen opslagruimte meer beschikbaar op de server.</translation> </message> @@ -1471,7 +1382,7 @@ op de server staat beschikbaar blijft met de originele naam.</translation> <message> <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/> <source>%1 - %2</source> - <translation type="unfinished"/> + <translation>%1 - %2</translation> </message> <message> <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/> @@ -1603,127 +1514,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 Synchronisatie gestart</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Synchronisatie begonnen voor %n geconfigureerde synchronisatie map(pen).</numerusform><numerusform>Synchronisatie begonnen voor %n geconfigureerde synchronisatie map(pen).</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Map %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Geen synchronisatie-mappen geconfigureerd.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Geen.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Recente wijzigingen</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Open %1 map</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Beheerde mappen:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Open map '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Open %1 in browser</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Quota worden berekend ...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Onbekende status</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Instellingen...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Details ...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Help</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>%1 afsluiten</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Quota niet beschikbaar</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1% van %2 gebruikt</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Recent niets gesynchroniseerd</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Synchroniseert %1 van %2 (%3 van %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Bijgewerkt</translation> </message> @@ -1996,15 +1897,15 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> - <translation type="unfinished"/> + <translation>kon map %1 niet maken</translation> </message> </context> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>Kon map %1 niet verwijderen</translation> </message> @@ -2211,8 +2112,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Synchroniseerfout - Klik op de info knop voor details.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index 3cc5d3497..d6ff620aa 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Wstrzymaj</translation> </message> @@ -104,127 +104,130 @@ <translation>Dodaj katalog...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Informacje...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Użycie zasobów</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Pobieranie informacji o użyciu</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Wznów</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Potwierdź usunięcie katalogu</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Potwierdź reset folderu </translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Połączenie %1 nie skonfigurowane.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Synchronizacja uruchomiona</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Podłączony do <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Start</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Obecnie</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Całkowicie</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 z %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Całkowicie zakończony.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 z %2, plik %3 z %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync nie obsługiwane, odmowa uprawnień.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync nie mógł odnaleźć określonego pliku.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync próbował utworzyć katalog, który już istnieje.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>Wystąpił błąd transmisji HTTP.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Anulowane przez użytkownika</translation> @@ -1250,13 +1253,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1269,145 +1272,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Formularz</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>Etykieta</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Czas</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Plik</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Folder</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Akcja</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Rozmiar</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Kopiuj</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Linki symboliczne ignorowane</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>plik</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>Katalog</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Element zignorowany</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 na zignorowanej liście</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Nieprawidłowe znaki</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Konflikt pliku.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Skopiuj do schowka</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>Brak wolnego miejsca na serwerze.</translation> </message> @@ -1587,127 +1507,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 Synchronizacja rozpoczęta</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Synchronizacja rozpoczęta dla %n folderu(ów).</numerusform><numerusform>Synchronizacja rozpoczęta dla %n folderu(ów).</numerusform><numerusform>Synchronizacja rozpoczęta dla %n folderu(ów).</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Folder %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Nie skonfigurowano synchronizowanych folderów.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Brak.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Ostatnie zmiany</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Otwórz folder %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Zarządzane foldery:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Otwórz katalog '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Otwórz %1 w przeglądarce</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Obliczam quote...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Nieznany status</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Ustawienia...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Szczegóły...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Wyjdź %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Quota n/a</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1% z %2 w użyciu</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Brak ostatnich synchronizacji</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Synchronizacja %1 z %2 (%3 z %4)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Aktualne</translation> </message> @@ -1981,7 +1891,7 @@ Kliknij</translation> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1989,7 +1899,7 @@ Kliknij</translation> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>Nie mogę usunąć katalogu %1</translation> </message> @@ -2196,8 +2106,8 @@ Kliknij</translation> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Błąd synchronizacji - kliknij przycisk Info aby uzyskać szczegółowe informacje.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index 205af9fcb..93a4b9ff1 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Pausa</translation> </message> @@ -104,127 +104,130 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Info...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Resumir</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Confirme a remoção da pasta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>%1 sem ligação configurada.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>A sincronização está a decorrer</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Iniciar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Actualmente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Completamente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 de %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 de %2, ficheiro %3 de %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -333,11 +336,6 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n <translation>CSync: Erro devido a permissões de negação não tratadas.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync: Erro a encontrar um ficheiro específico.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>O CSync tentou criar uma pasta que já existe.</translation> @@ -359,7 +357,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -379,6 +377,11 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n <translation>Ocorreu um erro de transmissão HTTP</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation type="unfinished"/> @@ -1251,13 +1254,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1270,145 +1273,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Formulário</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Tempo</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Pasta</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Tamanho</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>ficheiro</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>diretório</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Copiado para a área de transferência</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation type="unfinished"/> </message> @@ -1588,127 +1508,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 A sincronização inicou.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Nenhuma pasta de sincronização configurada.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Abrir a pasta %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Pastas Geridas:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Actualizado</translation> </message> @@ -1981,7 +1891,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1989,7 +1899,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation type="unfinished"/> </message> @@ -2196,8 +2106,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Erro na sincronização. Clique no botão info para detalhes.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index c275839ea..724a39a90 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -80,7 +80,7 @@ <message> <location filename="../src/mirall/accountsettings.ui" line="46"/> <source>Account to Synchronize</source> - <translation type="unfinished"/> + <translation>Contas para Sincronizar</translation> </message> <message> <location filename="../src/mirall/accountsettings.ui" line="52"/> @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Pause</translation> </message> @@ -104,127 +104,130 @@ <translation>Adicionar Pasta...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Informação...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Uso de Armazenamento</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Recuperando informações sobre o uso...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Nota:</b> Algumas pastas, incluindo as montadas na rede ou pastas compartilhadas, podem ter limites diferentes.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Resumir</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Confirma remoção da pasta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Confirme Reiniciar Pasta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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 o tráfego de dados significativo 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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Sem %1 conexão configurada.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Sincronização acontecendo</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation>Nenhuma conta configurada.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>A operação de sincronização está acontecendo.<br/>deseja finaliza-la?</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation>%1 de %2 (%3%) em uso.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Conectado à <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Iniciar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Atualmente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Completamente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 de %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Completamente finalizado.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 of %2, file %3 de %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <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/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation>Nenhuma conexão para %1 at <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <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> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync falhou devido a uma negativa de permissão não resolvida.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync falhou ao procurar um arquivo específico.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync tentou criar um diretório que já existe.</translation> @@ -355,10 +353,10 @@ <message> <location filename="../src/mirall/csyncthread.cpp" line="228"/> <source>The item is not synced because it is on the blacklist.</source> - <translation type="unfinished"/> + <translation>O item não está sincronizador porque está na lista negra.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation>Impossibilitado de iniciar a sincronização.</translation> </message> @@ -378,6 +376,11 @@ <translation>Houve um erro na transmissão HTTP.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Abortado pelo usuário</translation> @@ -629,7 +632,7 @@ documentação por possíveis correções.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="92"/> <source>No valid local folder selected!</source> - <translation type="unfinished"/> + <translation>Pasta local selecionada inválida!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="97"/> @@ -639,27 +642,27 @@ documentação por possíveis correções.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="121"/> <source>The local path %1 is already an upload folder. Please pick another one!</source> - <translation type="unfinished"/> + <translation>O caminho local %1 já é uma pasta de upload. Por favor, escolha outro!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="133"/> <source>The selected folder is a symbolic link. An already configuredfolder is contained in the folder this link is pointing to.</source> - <translation type="unfinished"/> + <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/mirall/folderwizard.cpp" line="140"/> <source>An already configured folder contains the currently entered folder.</source> - <translation type="unfinished"/> + <translation>Uma pasta já configurada contém a pasta atualmente inserida.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="146"/> <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>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/mirall/folderwizard.cpp" line="170"/> <source>The alias <i>%1</i> is already in use. Please pick another alias.</source> - <translation type="unfinished"/> + <translation>O alias <i>%1</ i> já está em uso. Por favor, escolha outro alias.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="126"/> @@ -697,17 +700,17 @@ documentação por possíveis correções.</translation> <message> <location filename="../src/mirall/folderwizard.cpp" line="264"/> <source>Failed to create the folder on %1. Please check manually.</source> - <translation type="unfinished"/> + <translation>Falha ao criar a pasta em %1. Por favor, verifique manualmente.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="368"/> <source>This folder is already being synced.</source> - <translation type="unfinished"/> + <translation>Esta pasta já está sendo sincronizada.</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="374"/> <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>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> <message> <location filename="../src/mirall/folderwizard.cpp" line="313"/> @@ -726,7 +729,7 @@ documentação por possíveis correções.</translation> <location filename="../src/mirall/folderwizard.cpp" line="43"/> <location filename="../src/mirall/folderwizard.cpp" line="45"/> <source><b>Warning:</b> </source> - <translation type="unfinished"/> + <translation><b>Advertênciia:</b></translation> </message> </context> <context> @@ -768,12 +771,12 @@ documentação por possíveis correções.</translation> <message> <location filename="../src/creds/httpcredentials.cpp" line="241"/> <source>Enter Password</source> - <translation type="unfinished"/> + <translation>Entrar Senha</translation> </message> <message> <location filename="../src/creds/httpcredentials.cpp" line="242"/> <source>Please enter %1 password for user '%2':</source> - <translation type="unfinished"/> + <translation>Por favor entrar %1 senha para o usuário '%2':</translation> </message> </context> <context> @@ -1256,15 +1259,15 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation>Arquivo local alterado durante a sincronização, sincronizando uma vez que chegou completamente</translation> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> - <translation type="unfinished"/> + <translation>A sincronização foi abortada pelo usuário.</translation> </message> </context> <context> @@ -1275,152 +1278,62 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u <translation>Formulário</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation>Detalhe do Status de Sincronização</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Tempo</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Arquivo</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Pasta</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Ação</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Tamanho</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Soft Link ignorado.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>Softlinks quebra a semântica de sincronização. -Por favor, não usá-los em diretórios sincronizados.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>arquivo</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>diretório</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>O %1 foi ignorado porque ele está listado nos clientes -ignorar a lista ou o nome do %1 contém -caracteres que não são sincronizáveis em um ambiente multi-plataforma.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Ítem ignorado</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 na lista ignorar</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>O %1 foi ignorado porque ele está listada na lista de clientes -lista de nomes para ignorar</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Caracteres inválidos</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>O nome %1 contém um ou mais caracteres inválidos que quebram -a sincronização em um ambiente muiti-plataforma</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Arquivo de conflito.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>O arquivo foi alterado no repositório do servidor e local, e, como resultado, -foi criado um chamado conflito. A mudança de local foi copiado para o arquivo de conflito -enquanto o arquivo do lado do servidor está disponível sob o nome original</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Copiado para área de transferência</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation>O estado de sincronização foi copiado para o clipboard.</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>Não existe mais espaço disponível para armazenamento no servidor.</translation> </message> @@ -1567,7 +1480,7 @@ Certifique-se que sua conexão de rede está funcionando.</translation> <message> <location filename="../src/mirall/systray.cpp" line="49"/> <source>%1: %2</source> - <translation type="unfinished"/> + <translation>%1: %2</translation> </message> </context> <context> @@ -1601,127 +1514,117 @@ Certifique-se que sua conexão de rede está funcionando.</translation> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 Sincronização Iniciada</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Sincronização iniciada para %n pasta(s) configurada(s).</numerusform><numerusform>Sincronização iniciada para %n pasta(s) configurada(s).</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> - <translation type="unfinished"/> + <translation>Favor conectar</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Pasta %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Pastas de sincronização não configuradas.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Nenhum.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Alterações Recentes</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Abrir pasta %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Pastas Gerenciadas:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Abrir pasta '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Abrir %1 no navegador</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Calculando cota...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Status desconhecido</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Configurações...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Detalhes...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Sair %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> - <translation type="unfinished"/> + <translation>Conectar em...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> - <translation type="unfinished"/> + <translation>Sair</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Cota n/a</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1% de %2 em uso</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Não há itens sincronizados recentemente</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Sincronizando %1 de %2 (%3 de %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Até a data</translation> </message> @@ -1994,7 +1897,7 @@ Certifique-se que sua conexão de rede está funcionando.</translation> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation>Não foi possível criar diretório %1</translation> </message> @@ -2002,7 +1905,7 @@ Certifique-se que sua conexão de rede está funcionando.</translation> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>O diretório %1 não pode ser removido</translation> </message> @@ -2209,8 +2112,8 @@ Certifique-se que sua conexão de rede está funcionando.</translation> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Erro da Sincronização - Clique no botão info para detalhes</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index c848ad38c..0da3bcdec 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Пауза</translation> </message> @@ -104,127 +104,130 @@ <translation>Добавить папку...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Инфо...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Использование хранилища</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Получение информации об использовании...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Заметьте:</b> Некоторые папки, включая сетевые или общие, могут иметь разные ограничения.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Продолжить</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Подтвердите удаление папки</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Подтвердить сброс папки</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Нет настроенного подключения %1.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Синхронизация запущена</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Синхронизация запущена.<br/>Вы хотите, остановить ее?</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Соединились с <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Начать</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Сейчас</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Полностью</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 из %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Полностью завершено.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 из %2, файл %3 из %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation>В данный момент информация о заполненности хранилища недоступна.</translation> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync упал в связи с отутствием обработки из-за отказа в доступе.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync не смог найти заданный файл.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync пытался создать директорию, которая уже существует.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>Произошла ошибка передачи http.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Прервано пользователем</translation> @@ -1257,13 +1260,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1276,154 +1279,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Форма</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Папка</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Действие</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Размер</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Символическая ссылка проигнорирована</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>Символические ссылки могут нарушить процесс синхронизации. -Пожалуйста не используйте их в синхронизируемых директориях</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>файл</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>директория</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>Пропускаем %1 так как он присутствует в списке -игнорируемых имён на клиенте или название %1 -содержит символы, нарушающие процесс -синхронизации между платформами</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Объект проигнорирован</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 в списке игнорируемых</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>Пропускаем %1 так как он присутствует в списке -игнорируемых имён на клиенте</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Недопустимые символы</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>Название %1 содержит один или более недопустимых символов -которые нарушают процесс синхронизации между платформами</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Конфликт файлов.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>Файл был изменён на сервере и в локальном репозитории и в результате -был создан так называемый конфликт. Локальные изменения сохранены -в конфликтный файл, в то время как файл с сервера доступен под -оригинальным названием</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Скопировано в буфер обмена</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>На сервере нет места для хранения информации.</translation> </message> @@ -1603,127 +1514,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 Синхронизация начата</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Синхронизация начата для %n выбранной папки.</numerusform><numerusform>Синхронизация начата для %n выбранных папок.</numerusform><numerusform>Синхронизация начата для %n выбранных папки(ок).</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Папка %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Нет папок для синхронизации.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Пусто</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Недавние изменения</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Открыть %1 папку</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Управляемые папки:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Открыть папку '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Открыть %1 в браузере</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Расчёт квоты...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Неизвестный статус</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Настройки...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Детали...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Выход %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Квота недоступна</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>Используется %1% из %2.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Недавно ничего не синхронизировалсь</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Синхронизируются %1 из %2 (%3 из %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Актуальная версия</translation> </message> @@ -1996,7 +1897,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -2004,7 +1905,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>Невозможно удалить директорию %1</translation> </message> @@ -2213,8 +2114,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Ошибка синхронизации - Нажмите кнопку информации для подробного описания.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index 273711087..c190952a0 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Pauza</translation> </message> @@ -104,127 +104,130 @@ <translation>Pridať priečinok...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Info...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Využitie úložného priestoru</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Získavam informácie o využití...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Poznámka:<b> Niektoré priečinky, zahŕňajúc sieťové alebo zdieľané, môžu mať odlišné limity.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Obnovenie</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Potvrdiť odstránenie priečinka</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Potvrdiť resetovanie priečinka</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Žiadne nakonfigurované %1 spojenie</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Prebiehajúca synchronizácia</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Pripojené k <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Štart</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Aktuálne</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Úplne</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 z %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Úplne dokončené.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 z %2, súbor %3 z %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <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> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync zlyhalo. Nedostatočné oprávnenie.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync sa nepodarilo nájsť hľadaný súbor.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync sa pokúsil vytvoriť priečinok, ktorý už existuje.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>Chyba HTTP prenosu.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Zrušené používateľom</translation> @@ -1257,13 +1260,13 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1276,152 +1279,62 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods <translation>Formulár</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>Štítok</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Čas</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Súbor</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Priečinok</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Akcia</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Veľkosť</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Kopírovať</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Symbolický odkaz je ignorovaný</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>Symbolické odkazy narušujú sémantiku synchronizácie. -Prosím, nepoužívajte ich v synchronizovaných priečinkoch</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>súbor</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>priečinok</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>Položka %1 bola ignorovaná, pretože je na zozname ignorovaných v synchronizačnom klientovi -alebo názov %1 obsahuje znaky nesynchronizovateľné -v prostredí viacerých platforiem</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Položka je ignorovaná</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 v zozname ignorovaných</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>Položka %1 bola preskočená, pretože je na zozname -ignorovaných názvov v synchronizačnom klientovi</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Neplatné znaky</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>Názov %1 obsahuje aspoň jeden neplatný znak, ktorý narušuje -synchronizáciu v prostredí viacerých platforiem</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Súbor v konflikte.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>Súbor bol pozmenený na serveri a lokálnom repozitári, čoho výsledkom bolo -vytvorenie takzvaného konfliktu. Lokálna zmena je kopírovaná do konfliktného -súboru, pokým súbor zo strany servera je dostupný z originálnym názvom</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Skopírované do "clipboard"</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>Nedostatok diskovej kapacity na serveri.</translation> </message> @@ -1601,127 +1514,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 Synchronizácia začala</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Je spustená synchronizácia pre %n nastavený priečinok.</numerusform><numerusform>Je spustená synchronizácia pre %n nastavené priečinky.</numerusform><numerusform>Je spustená synchronizácia pre %n nastavených priečinkov.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Priečinok %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Nie sú nastavené žiadne synchronizačné priečinky.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Žiaden.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Nedávne zmeny</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Otvoriť %1 priečinok</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Spravované priečinky:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Otvoriť priečinok '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Otvoriť %1 v prehliadači</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Počítanie kvóty...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Neznámy stav</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Nastavenia...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Detaily...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Ukončiť %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Kvóta n/a</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1% z %2 sa používa</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Žiadne nedávno synchronizované položky</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Synchronizovanie %1 z %2 (%3 z %4)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Až do dnešného dňa</translation> </message> @@ -1994,7 +1897,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -2002,7 +1905,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>Nemožno odstrániť priečinok %1</translation> </message> @@ -2209,8 +2112,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Chyba synchronizácie - Kliknite na tlačidlo Info pre zobrazenie detailov.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index b4d11f53a..41fccfed2 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Premor</translation> </message> @@ -104,127 +104,130 @@ <translation>Dodaj mapo ...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Podrobnosti ...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Poraba prostora</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Pridobivanje podatkov o prostoru ...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Opomba:</b> nekatere mape, vključno s priklopljenimi mapami in mapami v souporabi, imajo morda različne omejitve.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Nadaljuj</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Potrdi odstranitev mape</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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 mape iz odjemalca ne bodo odstranjene.</p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Potrdi ponastavitev mape</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Ni nastavljenih %1 povezav.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Usklajevanje je v teku</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <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/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Začni</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>Trenutno</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>V celoti</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 od %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>V celoti končano.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 od %2, datoteka %3 od %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>Delovanje CSync je zaradi neustreznih dovoljenj spodletelo.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>Iskanje določene datoteke s CSync je spodletelo.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>Prišlo je do napake na CSync zaradi poskusa ustvarjanja mape z že obstoječim imenom.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>Prišlo je do napake med prenosom HTTP.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Opravilo je bilo prekinjeno s strani uporabnika</translation> @@ -1250,13 +1253,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1269,145 +1272,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Obrazec</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>Besedilna oznaka</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Čas</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Datoteka</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Mapa</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Dejanje</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Velikost</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Kopiraj</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>datoteka</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>mapa</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Predmet je prezrt</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Neveljavni znaki</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Kopirano v odložišče</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation type="unfinished"/> </message> @@ -1587,127 +1507,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>Usklajevanje %1 je začeto</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Mapa %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Ni nastavljenih map za usklajevanje.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Brez</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Nedavne spremembe</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Odpri %1 mapo</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Upravljane mape:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Odpri mapo '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Odpri %1 v brskalniku</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Preračunavanje količinske omejitve ...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Neznano stanje</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Nastavitve ...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Podrobnosti ...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Pomoč</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Končaj %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Količinska omejitev ni na voljo</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1% od %2 v uporabi</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Ni nedavno usklajenih predmetov</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Poteka usklajevanje %1 od %2 (%3 od %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Ni posodobitev</translation> </message> @@ -1749,7 +1659,7 @@ Please ensure that your network connection is working.</source> <message> <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/> <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Izbrana možnost določa, da bo do podatki v krajevni mapi v celoti izbrisani, nato pa bo vsebina te mape usklajena z vsebino na strežniku.</p><p>Če želite datoteke v tej mapi poslati na strežnik, te možnosti NE označite.</p></body></html></translation> </message> <message> <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/> @@ -1980,7 +1890,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1988,7 +1898,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation type="unfinished"/> </message> @@ -2195,8 +2105,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Napaka med usklajevanjem - za več podrobnosti kliknite povezavo</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index 9b05adab2..2af16d1e9 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Paus</translation> </message> @@ -104,127 +104,130 @@ <translation>Lägg till mapp</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Info...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>Lagringsutrymme</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>Hämtar information om användning...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>Notera:</b> Vissa mappar, inklusive nätverksmonterade eller delade mappar, kan ha olika begränsningar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Återuppta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Bekräfta radering av mapp</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>Bekräfta återställning av mapp</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Ingen %1 anslutning konfigurerad.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Synkronisering pågår</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <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/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation>Ansluten till <a href="%1">%2</a>.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>Start</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>För närvarande:</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>Fullständigt</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 av %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>Helt klar.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 av %2, fil %3 av %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation>Just nu finns ingen utrymmes information tillgänglig</translation> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSYNC misslyckades på grund av att nekad åtkomst inte hanterades.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync misslyckades hitta en specifik fil.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync försökte skapa en mapp som redan finns.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>Ett HTTP överföringsfel inträffade.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation>Avbruten av användare</translation> @@ -1256,13 +1259,13 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1275,152 +1278,62 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort <translation>Form</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>Textetikett</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>Fil</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Mapp</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation>Ågärd</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Storlek</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Kopiera</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation>Mjuk länk ignorerad</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation>Mjuka länkar bryter semantiken för synkronisering.⏎ -Använd dem inte i synkade mappar.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>fil</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>mapp</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation>%1 har ignorerats eftersom det finns i klientens ignoreringslista⏎ -eller att namnet %1 innehåller bokstäver som inte är synkbara⏎ -i en plattformsoberoende miljö.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation>Objektet ignorerat</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation>%1 på ignorer listan</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation>%1 hoppades över på grund av att den är listad i klientens -lista av namn att ignorera</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation>Ogiltiga tecken</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation>%1 namnet innehåller en eller flera ogiltiga tecken som avbryter -synkningen i en multiplatforms miljö</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation>Konfliktfil.</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation>Filen ändrades både på servern och lokalt vilket har skapat en -så kallad konflikt. Den lokala förändringen kopieras till konfliktfilen -medan filen från serversidan är tillgänglig under originalnamnet</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Kopierat till urklipp</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation>Det finns inte tillräckligt med lagringsutrymme tillgängligt på servern.</translation> </message> @@ -1600,127 +1513,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 Synk startad</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation><numerusform>Synkronisering startad för %n konfigurerad synk-katalog.</numerusform><numerusform>Synkronisering startad för %n konfigurerade synk-kataloger.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>Mapp %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Ingen synkroniseringsmapp är konfigurerad.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation>Ingen.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation>Senaste ändringar</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Öppna %1 mappen</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Hanterade mappar:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation>Öppna mapp '%1'</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>Öppna %1 i webbläsaren</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation>Beräknar kvot...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation>Okänd status</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation>Inställningar...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation>Detaljer...</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Hjälp</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation>Avsluta %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation>Kvot n/a</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation>%1% av %2 används</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation>Inga filer har synkroniseras nyligen</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Synkar %1 av %2 (%3 av %4) </translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>Aktuell version</translation> </message> @@ -1993,7 +1896,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -2001,7 +1904,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation>Kunde ej ta bort mappen %1</translation> </message> @@ -2208,8 +2111,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Synkroniseringsfel - Klicka på info-knappen för mer information.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts index e14b8a5ad..f8903acc5 100644 --- a/translations/mirall_th.ts +++ b/translations/mirall_th.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>หยุดชั่วคราว</translation> </message> @@ -104,127 +104,130 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>ข้อมูล...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>ดำเนินการต่อ</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>ยืนยันการลบโฟลเดอร์</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>การซิงค์ข้อมูลกำลังทำงาน</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>การดำเนินการเพื่อถ่ายโอนข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่?</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync ล้มเหลว เนื่องจากไม่สามารถจัดการกับการปฏิเสธให้เข้าใช้งานได้</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync ล้มเหลวในการค้นหาไฟล์</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync ได้พยายามที่จะสร้างไดเร็กทอรี่ที่มีอยู่แล้ว</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>เกิดข้อผิดพลาดเกี่ยวกับ HTTP transmission</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation type="unfinished"/> @@ -1250,13 +1253,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1269,145 +1272,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>แบบฟอร์ม</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>ป้ายข้อความ</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>แฟ้มเอกสาร</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>ขนาด</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>คัดลอก</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>ไฟล์</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation type="unfinished"/> </message> @@ -1587,127 +1507,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>การซิงค์ข้อมูล %1 เริ่มต้นแล้ว</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation type="unfinished"><numerusform></numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>ยังไม่มีการกำหนดค่าโฟลเดอร์ที่ต้องการซิงค์ข้อมูล</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>เปิดโฟลเดอร์ %1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>ช่วยเหลือ</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation type="unfinished"/> </message> @@ -1980,7 +1890,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1988,7 +1898,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation type="unfinished"/> </message> @@ -2195,8 +2105,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>การเชื่อมข้อมูลเกิดข้อผิดพลาด - คลิกที่ปุ่มข้อมูลเพื่อดูรายละเอียด</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index b53767cb3..6126aa6a6 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>Пауза</translation> </message> @@ -104,127 +104,130 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>Інформація...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>Відновлення</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>Підтвердіть видалення каталогу</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>Жодного %1 підключення не налаштовано.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>Виконується синхронізація</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Виконується процедура синхронізації.<br/>Бажаєте відмінити?</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync завершився неуспішно через порушення прав доступу.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync не вдалося знайти вказаний файл.</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync намагалася створити каталог, який вже існує.</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>Сталася помилка передачі даних по HTTP.</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation type="unfinished"/> @@ -1250,13 +1253,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1269,145 +1272,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Форма</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>Мітка</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>Час</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>Тека</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>Розмір</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>Копіювати</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>файл</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>каталог</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>Скопійовано в буфер обміну</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation type="unfinished"/> </message> @@ -1587,127 +1507,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 синхронізація розпочата</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>Жодна тека не налаштована для синхронізації.</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>Відкрити %1 каталог</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>Керовані теки:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>Допомога</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation type="unfinished"/> </message> @@ -1980,7 +1890,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1988,7 +1898,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation type="unfinished"/> </message> @@ -2195,8 +2105,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>Помилка синхронізації - Натисніть інформаційну кнопку для з'ясування подробиць.</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index 85021fd14..30b608636 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>暂停</translation> </message> @@ -104,127 +104,130 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>信息……</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>存储使用情况</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>继续</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>确认移除文件夹</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>没有 %1 连接配置。</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>同步正在运行</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>正在执行同步。<br />您确定要关闭它吗？</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>开始</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>出于未处理的权限拒绝，CSync 失败。</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync 无法找到一个指定文件。</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync 尝试创建了已有的文件夹。</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>HTTP 传输错误。</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation type="unfinished"/> @@ -1250,13 +1253,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1269,145 +1272,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>窗体</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>文本标签</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>时间</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation>文件</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>文件夹</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>大小</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>复制</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>文件</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>复制到剪贴板</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation type="unfinished"/> </message> @@ -1587,127 +1507,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1 同步已启动</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation type="unfinished"><numerusform></numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>文件夹 %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>没有已配置的同步文件夹。</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>打开 %1 目录</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>管理的文件夹：</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation>在浏览器中打开%1</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>帮助</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>更新</translation> </message> @@ -1980,7 +1890,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1988,7 +1898,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation type="unfinished"/> </message> @@ -2195,8 +2105,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>同步失败-点击信息按钮查看详细</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index e9e8574c1..c4b4ec542 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -89,7 +89,7 @@ </message> <message> <location filename="../src/mirall/accountsettings.ui" line="71"/> - <location filename="../src/mirall/accountsettings.cpp" line="135"/> + <location filename="../src/mirall/accountsettings.cpp" line="132"/> <source>Pause</source> <translation>暫停</translation> </message> @@ -104,127 +104,130 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="98"/> - <source>Info...</source> - <translation>資訊...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="110"/> + <location filename="../src/mirall/accountsettings.ui" line="103"/> <source>Storage Usage</source> <translation>空間用途</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="132"/> + <location filename="../src/mirall/accountsettings.ui" line="125"/> <source>Retrieving usage information...</source> <translation>取得用途資訊...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="139"/> + <location filename="../src/mirall/accountsettings.ui" line="132"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation><b>注意:</b> 有些資料夾，包括網路掛載或分享資料夾，可能有不同的限制。</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="137"/> + <location filename="../src/mirall/accountsettings.cpp" line="134"/> <source>Resume</source> <translation>繼續</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="291"/> + <location filename="../src/mirall/accountsettings.cpp" line="288"/> <source>Confirm Folder Remove</source> <translation>確認移除資料夾</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="289"/> <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/mirall/accountsettings.cpp" line="324"/> + <location filename="../src/mirall/accountsettings.cpp" line="321"/> <source>Confirm Folder Reset</source> <translation>資料夾重設確認</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="325"/> + <location filename="../src/mirall/accountsettings.cpp" line="322"/> <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/mirall/accountsettings.cpp" line="803"/> + <location filename="../src/mirall/accountsettings.cpp" line="800"/> <source>No %1 connection configured.</source> <translation>無%1連線設定</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="428"/> + <location filename="../src/mirall/accountsettings.cpp" line="425"/> <source>Sync Running</source> <translation>同步中</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="104"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>No account configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="429"/> + <location filename="../src/mirall/accountsettings.cpp" line="426"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>正在同步中<br/>你真的想要中斷？</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="758"/> + <location filename="../src/mirall/accountsettings.cpp" line="755"/> <source>%1 of %2 (%3%) in use.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="789"/> + <location filename="../src/mirall/accountsettings.cpp" line="786"/> <source>Connected to <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="640"/> + <location filename="../src/mirall/accountsettings.cpp" line="637"/> <source>Start</source> <translation>啟動</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="649"/> + <location filename="../src/mirall/accountsettings.cpp" line="646"/> <source>Currently</source> <translation>目前</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="657"/> + <location filename="../src/mirall/accountsettings.cpp" line="654"/> <source>Completely</source> <translation>完成</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="691"/> + <location filename="../src/mirall/accountsettings.cpp" line="688"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 的 %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="694"/> + <location filename="../src/mirall/accountsettings.cpp" line="691"/> <source>Completely finished.</source> <translation>完成結束。</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="701"/> + <location filename="../src/mirall/accountsettings.cpp" line="698"/> <source>%1 of %2, file %3 of %4</source> <translation>%1 的 %2, 檔案 %3 的 %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="792"/> + <location filename="../src/mirall/accountsettings.cpp" line="789"/> <source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="796"/> + <location filename="../src/mirall/accountsettings.cpp" line="793"/> <source>No connection to %1 at <a href="%1">%2</a>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="762"/> + <location filename="../src/mirall/accountsettings.cpp" line="759"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"/> </message> </context> <context> + <name>Mirall::Application</name> + <message> + <location filename="../src/mirall/application.cpp" line="263"/> + <source>Connection failed</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Mirall::CSyncThread</name> <message> <location filename="../src/mirall/csyncthread.cpp" line="85"/> @@ -332,11 +335,6 @@ <translation>CSync 失敗，由於未處理的存取被拒。</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="161"/> - <source>CSync failed to find a specific file.</source> - <translation>CSync 沒辦法找到某一個檔案。</translation> - </message> - <message> <location filename="../src/mirall/csyncthread.cpp" line="164"/> <source>CSync tried to create a directory that already exists.</source> <translation>CSync 試圖建立一個已經存在的目錄。</translation> @@ -358,7 +356,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="418"/> + <location filename="../src/mirall/csyncthread.cpp" line="428"/> <source>Unable to initialize a sync journal.</source> <translation type="unfinished"/> </message> @@ -378,6 +376,11 @@ <translation>HTTP 傳輸錯誤。</translation> </message> <message> + <location filename="../src/mirall/csyncthread.cpp" line="161"/> + <source>CSync failed to access </source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/mirall/csyncthread.cpp" line="176"/> <source>Aborted by the user</source> <translation type="unfinished"/> @@ -1250,13 +1253,13 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::PropagateUploadFile</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="361"/> - <location filename="../src/mirall/owncloudpropagator.cpp" line="425"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/> <source>Local file changed during sync, syncing once it arrived completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="367"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/> <source>Sync was aborted by user.</source> <translation type="unfinished"/> </message> @@ -1269,145 +1272,62 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>格式</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="27"/> + <location filename="../src/mirall/protocolwidget.ui" line="20"/> <source>Detailed Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="57"/> + <location filename="../src/mirall/protocolwidget.ui" line="49"/> <source>3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="62"/> + <location filename="../src/mirall/protocolwidget.ui" line="54"/> <source>4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.ui" line="70"/> - <source>TextLabel</source> - <translation>文字標籤</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="49"/> + <location filename="../src/mirall/protocolwidget.cpp" line="47"/> <source>Time</source> <translation>時間</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="50"/> + <location filename="../src/mirall/protocolwidget.cpp" line="48"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="51"/> + <location filename="../src/mirall/protocolwidget.cpp" line="49"/> <source>Folder</source> <translation>資料夾</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="52"/> + <location filename="../src/mirall/protocolwidget.cpp" line="50"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="53"/> + <location filename="../src/mirall/protocolwidget.cpp" line="51"/> <source>Size</source> <translation>大小</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="62"/> + <location filename="../src/mirall/protocolwidget.cpp" line="60"/> <source>Copy</source> <translation>複製</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="125"/> - <source>Blacklisted</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/mirall/protocolwidget.cpp" line="126"/> - <source>The file is blacklisted because of previous error conditions.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="128"/> - <source>Soft Link ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="129"/> - <source>Softlinks break the semantics of synchronization. -Please do not use them in synced directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="132"/> - <source>file</source> - <translation>檔案</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="134"/> - <source>directory</source> - <translation>目錄</translation> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="136"/> - <source>The %1 was ignored because it is listed in the clients ignore list -or the %1 name contains characters that are not syncable -in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="139"/> - <source>Item ignored</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="141"/> - <source>%1 on ignore list</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="142"/> - <source>The %1 was skipped because it is listed on the clients -list of names to ignore</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="145"/> - <source>Invalid characters</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="146"/> - <source>The %1 name contains one or more invalid characters which break -syncing in a cross platform environment</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="151"/> - <source>Conflict file.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="152"/> - <source>The file was changed on server and local repository and as a result it -created a so called conflict. The local change is copied to the conflict -file while the file from the server side is available under the original -name</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> <source>Copied to clipboard</source> <translation>複製至剪貼簿中</translation> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="245"/> + <location filename="../src/mirall/protocolwidget.cpp" line="126"/> <source>The sync status has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/protocolwidget.cpp" line="296"/> + <location filename="../src/mirall/protocolwidget.cpp" line="177"/> <source>No more storage space available on server.</source> <translation type="unfinished"/> </message> @@ -1587,127 +1507,117 @@ Please ensure that your network connection is working.</source> <context> <name>Mirall::ownCloudGui</name> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="165"/> - <source>%1 Sync Started</source> - <translation>%1同步已經開始</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/owncloudgui.cpp" line="166"/> - <source>Sync started for %n configured sync folder(s).</source> - <translation type="unfinished"><numerusform></numerusform></translation> - </message> - <message> - <location filename="../src/mirall/owncloudgui.cpp" line="178"/> + <location filename="../src/mirall/owncloudgui.cpp" line="174"/> <source>Please sign in</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="210"/> + <location filename="../src/mirall/owncloudgui.cpp" line="206"/> <source>Folder %1: %2</source> <translation>資料夾 %1: %2</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="216"/> + <location filename="../src/mirall/owncloudgui.cpp" line="212"/> <source>No sync folders configured.</source> <translation>尚未指定同步資料夾</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="241"/> + <location filename="../src/mirall/owncloudgui.cpp" line="237"/> <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="245"/> + <location filename="../src/mirall/owncloudgui.cpp" line="241"/> <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="262"/> + <location filename="../src/mirall/owncloudgui.cpp" line="258"/> <source>Open %1 folder</source> <translation>開啟%1資料夾</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="272"/> + <location filename="../src/mirall/owncloudgui.cpp" line="268"/> <source>Managed Folders:</source> <translation>管理的資料夾:</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="275"/> + <location filename="../src/mirall/owncloudgui.cpp" line="271"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="350"/> + <location filename="../src/mirall/owncloudgui.cpp" line="347"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="352"/> + <location filename="../src/mirall/owncloudgui.cpp" line="349"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="354"/> + <location filename="../src/mirall/owncloudgui.cpp" line="351"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="356"/> + <location filename="../src/mirall/owncloudgui.cpp" line="353"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="357"/> + <location filename="../src/mirall/owncloudgui.cpp" line="354"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="362"/> + <location filename="../src/mirall/owncloudgui.cpp" line="359"/> <source>Help</source> <translation>說明</translation> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="364"/> + <location filename="../src/mirall/owncloudgui.cpp" line="361"/> <source>Quit %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="367"/> + <location filename="../src/mirall/owncloudgui.cpp" line="364"/> <source>Sign in...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="369"/> + <location filename="../src/mirall/owncloudgui.cpp" line="366"/> <source>Sign out</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="379"/> + <location filename="../src/mirall/owncloudgui.cpp" line="376"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="386"/> + <location filename="../src/mirall/owncloudgui.cpp" line="383"/> <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="407"/> + <location filename="../src/mirall/owncloudgui.cpp" line="404"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="416"/> + <location filename="../src/mirall/owncloudgui.cpp" line="413"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="444"/> + <location filename="../src/mirall/owncloudgui.cpp" line="441"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudgui.cpp" line="466"/> + <location filename="../src/mirall/owncloudgui.cpp" line="463"/> <source>Up to date</source> <translation>最新的</translation> </message> @@ -1980,7 +1890,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalMkdir</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="189"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="197"/> <source>could not create directory %1</source> <translation type="unfinished"/> </message> @@ -1988,7 +1898,7 @@ Please ensure that your network connection is working.</source> <context> <name>PropagateLocalRemove</name> <message> - <location filename="../src/mirall/owncloudpropagator.cpp" line="168"/> + <location filename="../src/mirall/owncloudpropagator.cpp" line="174"/> <source>Could not remove directory %1</source> <translation type="unfinished"/> </message> @@ -2195,8 +2105,8 @@ Please ensure that your network connection is working.</source> </message> <message> <location filename="../src/mirall/theme.cpp" line="63"/> - <source>Sync Error - Click info button for details.</source> - <translation>同步錯誤- 請點擊 資訊按鈕 以獲取詳細資訊</translation> + <source>Sync Error</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/theme.cpp" line="66"/> |